Skip to content

Commit

Permalink
Make sure Airbyte release process uses JDK 19. (#14993)
Browse files Browse the repository at this point in the history
Follow up to #14971 . Make sure to update this for the OSS publishing process as well.

Also update all the dockerfiles.

Connectors are not touched.
  • Loading branch information
davinchia authored Jul 25, 2022
1 parent 9f80765 commit cd5d8c2
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 11 deletions.
4 changes: 2 additions & 2 deletions airbyte-bootloader/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JDK_VERSION=17.0.1
ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
ARG JDK_VERSION=19-slim-bullseye
ARG JDK_IMAGE=openjdk:${JDK_VERSION}
FROM ${JDK_IMAGE}

ARG VERSION=0.39.38-alpha
Expand Down
4 changes: 2 additions & 2 deletions airbyte-container-orchestrator/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JDK_VERSION=17.0.1
ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
ARG JDK_VERSION=19-slim-bullseye
ARG JDK_IMAGE=openjdk:${JDK_VERSION}
FROM ${JDK_IMAGE} AS sync-attempt

ARG DOCKER_BUILD_ARCH=amd64
Expand Down
4 changes: 2 additions & 2 deletions airbyte-metrics/reporter/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JDK_VERSION=17.0.1
ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
ARG JDK_VERSION=19-slim-bullseye
ARG JDK_IMAGE=openjdk:${JDK_VERSION}
FROM ${JDK_IMAGE} AS metrics-reporter

ARG VERSION=0.39.38-alpha
Expand Down
4 changes: 2 additions & 2 deletions airbyte-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JDK_VERSION=17.0.1
ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
ARG JDK_VERSION=19-slim-bullseye
ARG JDK_IMAGE=openjdk:${JDK_VERSION}
FROM ${JDK_IMAGE} AS server

EXPOSE 8000
Expand Down
4 changes: 2 additions & 2 deletions airbyte-workers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JDK_VERSION=17.0.1
ARG JDK_IMAGE=openjdk:${JDK_VERSION}-slim
ARG JDK_VERSION=19-slim-bullseye
ARG JDK_IMAGE=openjdk:${JDK_VERSION}
FROM ${JDK_IMAGE} AS worker

ARG DOCKER_BUILD_ARCH=amd64
Expand Down
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ check.dependsOn 'spotlessApply'
@SuppressWarnings('GroovyAssignabilityCheck')
def Task getDockerBuildTask(String artifactName, String projectDir, String buildVersion, String buildTag) {
return task ("buildDockerImage-$artifactName"(type: DockerBuildImage) {
// This is currently only used for connectors.
def jdkVersion = System.getenv('JDK_VERSION') ?: '17.0.1'

def arch = System.getenv('BUILD_ARCH') ?: System.getProperty("os.arch").toLowerCase()
Expand Down
3 changes: 2 additions & 1 deletion tools/bin/publish_docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ projectDir=(
)

# Set default values to required vars. If set in env, values will be taken from there.
JDK_VERSION=${JDK_VERSION:-17.0.1}
# Primarily for testing.
JDK_VERSION=${JDK_VERSION:-19-slim-bullseye}
ALPINE_IMAGE=${ALPINE_IMAGE:-alpine:3.14}
POSTGRES_IMAGE=${POSTGRES_IMAGE:-postgres:13-alpine}

Expand Down

0 comments on commit cd5d8c2

Please sign in to comment.