diff --git a/airbyte-bootloader/Dockerfile b/airbyte-bootloader/Dockerfile index 8e626c01672d..c0490912f595 100644 --- a/airbyte-bootloader/Dockerfile +++ b/airbyte-bootloader/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} ENV APPLICATION airbyte-bootloader diff --git a/airbyte-container-orchestrator/Dockerfile b/airbyte-container-orchestrator/Dockerfile index 23e398be535a..53a05f4d7420 100644 --- a/airbyte-container-orchestrator/Dockerfile +++ b/airbyte-container-orchestrator/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim AS sync-attempt +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} AS sync-attempt ARG DOCKER_BUILD_ARCH=amd64 diff --git a/airbyte-integrations/bases/base-java/Dockerfile b/airbyte-integrations/bases/base-java/Dockerfile index ea1844de4e64..e3fccb5de6db 100644 --- a/airbyte-integrations/bases/base-java/Dockerfile +++ b/airbyte-integrations/bases/base-java/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} COPY --from=airbyte/integration-base:dev /airbyte /airbyte WORKDIR /airbyte diff --git a/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile b/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile index 6d7bb0867774..33d9f5c73952 100644 --- a/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile +++ b/airbyte-integrations/bases/base-standard-source-test-file/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} ARG DOCKER_BUILD_ARCH=amd64 diff --git a/airbyte-integrations/bases/standard-source-test/Dockerfile b/airbyte-integrations/bases/standard-source-test/Dockerfile index 708fd59d233a..2445d3ff8c98 100644 --- a/airbyte-integrations/bases/standard-source-test/Dockerfile +++ b/airbyte-integrations/bases/standard-source-test/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} ARG DOCKER_BUILD_ARCH=amd64 diff --git a/airbyte-metrics/reporter/Dockerfile b/airbyte-metrics/reporter/Dockerfile index 4ee2f06be737..b5fb08a40ac8 100644 --- a/airbyte-metrics/reporter/Dockerfile +++ b/airbyte-metrics/reporter/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim AS metrics-reporter +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} AS metrics-reporter ENV APPLICATION airbyte-metrics-reporter diff --git a/airbyte-scheduler/app/Dockerfile b/airbyte-scheduler/app/Dockerfile index 678e0839a901..73e0238a28c2 100644 --- a/airbyte-scheduler/app/Dockerfile +++ b/airbyte-scheduler/app/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim AS scheduler +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} AS scheduler ENV APPLICATION airbyte-scheduler diff --git a/airbyte-server/Dockerfile b/airbyte-server/Dockerfile index 75d1859a0104..2a60f2042401 100644 --- a/airbyte-server/Dockerfile +++ b/airbyte-server/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim AS server +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} AS server EXPOSE 8000 diff --git a/airbyte-webapp/Dockerfile b/airbyte-webapp/Dockerfile index 3435c31534ed..92941248d774 100644 --- a/airbyte-webapp/Dockerfile +++ b/airbyte-webapp/Dockerfile @@ -1,4 +1,5 @@ -FROM nginx:1.19-alpine as webapp +ARG NGINX_IMAGE=nginx:1.19-alpine +FROM ${NGINX_IMAGE} as webapp EXPOSE 80 diff --git a/airbyte-workers/Dockerfile b/airbyte-workers/Dockerfile index 47d7d7b79384..f010083933d2 100644 --- a/airbyte-workers/Dockerfile +++ b/airbyte-workers/Dockerfile @@ -1,5 +1,7 @@ ARG JDK_VERSION=17.0.1 -FROM openjdk:${JDK_VERSION}-slim AS worker +ARG JDK_IMAGE_REPOSITORY=openjdk +ARG JDK_IMAGE_TAG=${JDK_VERSION}-slim +FROM ${JDK_IMAGE_REPOSITORY}:${JDK_IMAGE_TAG} AS worker ARG DOCKER_BUILD_ARCH=amd64 diff --git a/build.gradle b/build.gradle index 803c5e3a3877..f21faee7156b 100644 --- a/build.gradle +++ b/build.gradle @@ -135,6 +135,8 @@ def Task getDockerBuildTask(String artifactName, String projectDir) { def buildPlatform = System.getenv('DOCKER_BUILD_PLATFORM') ?: 'linux/amd64' def alpineImage = System.getenv('ALPINE_IMAGE') ?: 'alpine:3.4' def postgresImage = System.getenv('POSTGRES_IMAGE') ?: 'postgres:13-alpine' + def nginxImage = System.getenv('NGINX_IMAGE') ?: 'nginx:1.19-alpine' + def openJDKImageRepo = System.getenv('JDK_IMAGE_REPOSITORY') ?: 'openjdk' def jdkVersion = System.getenv('JDK_VERSION') ?: '17.0.1' def buildArch = System.getenv('DOCKER_BUILD_ARCH') ?: 'amd64' @@ -145,6 +147,8 @@ def Task getDockerBuildTask(String artifactName, String projectDir) { buildArgs.put('DOCKER_BUILD_ARCH', buildArch) buildArgs.put('ALPINE_IMAGE', alpineImage) buildArgs.put('POSTGRES_IMAGE', postgresImage) + buildArgs.put('NGINX_IMAGE', nginxImage) + buildArgs.put('JDK_IMAGE_REPOSITORY', openJDKImageRepo) }) }