Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build on MacOS M1 (Apple Silicon) #7104

Merged
merged 1 commit into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-config/persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ dependencies {
implementation project(':airbyte-config:init')
implementation project(':airbyte-json-validation')
implementation 'com.google.cloud:google-cloud-secretmanager:1.7.2'
testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"
integrationTestJavaImplementation project(':airbyte-config:persistence')
}
2 changes: 1 addition & 1 deletion airbyte-db/jooq/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies {

// jOOQ code generation
implementation 'org.jooq:jooq-codegen:3.13.4'
implementation "org.testcontainers:postgresql:1.15.1"
implementation "org.testcontainers:postgresql:1.15.3"
// The jOOQ code generator only has access to classes added to the jooqGenerator configuration
jooqGenerator project(':airbyte-db:lib')
}
Expand Down
2 changes: 1 addition & 1 deletion airbyte-db/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies {
implementation project(':airbyte-protocol:models')
implementation project(':airbyte-json-validation')
implementation "org.flywaydb:flyway-core:7.14.0"
implementation "org.testcontainers:postgresql:1.15.1"
implementation "org.testcontainers:postgresql:1.15.3"

testImplementation project(':airbyte-test-utils')
testImplementation 'org.apache.commons:commons-lang3:3.11'
Expand Down
4 changes: 3 additions & 1 deletion airbyte-e2e-testing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ plugins {
id "com.github.node-gradle.node" version "2.2.4"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'

node {
download = true
version = "14.11.0"
version = nodeVersion
}


Expand Down
3 changes: 2 additions & 1 deletion airbyte-integrations/bases/base-java/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim
COPY --from=airbyte/integration-base:dev /airbyte /airbyte

WORKDIR /airbyte
Expand Down
4 changes: 2 additions & 2 deletions airbyte-integrations/bases/base-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ dependencies {

implementation project(':airbyte-protocol:models')
implementation project(":airbyte-json-validation")
implementation "org.testcontainers:testcontainers:1.15.1"
implementation "org.testcontainers:jdbc:1.15.1"
implementation "org.testcontainers:testcontainers:1.15.3"
implementation "org.testcontainers:jdbc:1.15.3"

implementation files(project(':airbyte-integrations:bases:base').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim

# Install Docker to launch worker images. Eventually should be replaced with Docker-java.
# See https://gitter.im/docker-java/docker-java?at=5f3eb87ba8c1780176603f4e for more information on why we are not currently using Docker-java
Expand Down
3 changes: 2 additions & 1 deletion airbyte-integrations/bases/standard-source-test/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim

# Install Docker to launch worker images. Eventually should be replaced with Docker-java.
# See https://gitter.im/docker-java/docker-java?at=5f3eb87ba8c1780176603f4e for more information on why we are not currently using Docker-java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ plugins {
id "com.github.node-gradle.node" version "2.2.4"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'

node {
download = true
version = "14.11.0"
version = nodeVersion
}

assemble.dependsOn(npmInstall)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ dependencies {

testImplementation project(':airbyte-test-utils')

testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dependencies {
implementation 'com.github.alexmojaki:s3-stream-upload:2.2.2'
implementation 'com.fasterxml.jackson.core:jackson-databind'

testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-meilisearch')

integrationTestJavaImplementation "org.testcontainers:testcontainers:1.15.1"
integrationTestJavaImplementation "org.testcontainers:testcontainers:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
integrationTestJavaImplementation "org.testcontainers:mysql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:mysql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-mysql')
integrationTestJavaImplementation "org.testcontainers:mysql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:mysql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dependencies {

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')

integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ dependencies {

testImplementation project(':airbyte-test-utils')

testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-destination-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:destination-postgres')

integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
integrationTestJavaImplementation files(project(':airbyte-integrations:bases:base-normalization').airbyteDocker.outputs)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dependencies {
testImplementation project(":airbyte-json-validation")
testImplementation project(':airbyte-test-utils')

testImplementation 'org.testcontainers:postgresql:1.15.1'
testImplementation 'org.testcontainers:postgresql:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
4 changes: 2 additions & 2 deletions airbyte-integrations/connectors/source-jdbc/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ dependencies {
testImplementation project(':airbyte-test-utils')

testImplementation "org.postgresql:postgresql:42.2.18"
testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.1"
integrationTestJavaImplementation "org.testcontainers:postgresql:1.15.3"

testFixturesImplementation "org.hamcrest:hamcrest-all:1.3"
testFixturesImplementation project(':airbyte-protocol:models')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation "org.testcontainers:mssqlserver:1.15.1"
testImplementation "org.testcontainers:mssqlserver:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-mssql-strict-encrypt')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation "org.testcontainers:mssqlserver:1.15.1"
testImplementation "org.testcontainers:mssqlserver:1.15.3"

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-mssql')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
testImplementation project(':airbyte-test-utils')

testImplementation 'org.testcontainers:mysql:1.15.1'
testImplementation 'org.testcontainers:mysql:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:bases:debezium'))
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation 'org.testcontainers:mysql:1.15.1'
testImplementation 'org.testcontainers:mysql:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')
integrationTestJavaImplementation project(':airbyte-integrations:connectors:source-mysql')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
testImplementation project(':airbyte-test-utils')

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation 'org.testcontainers:oracle-xe:1.15.2'
testImplementation 'org.testcontainers:oracle-xe:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {
testImplementation project(':airbyte-test-utils')

testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation 'org.testcontainers:oracle-xe:1.15.2'
testImplementation 'org.testcontainers:oracle-xe:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ dependencies {
testImplementation testFixtures(project(':airbyte-integrations:connectors:source-jdbc'))
testImplementation project(':airbyte-test-utils')

testImplementation 'org.testcontainers:postgresql:1.15.1'
testImplementation 'org.testcontainers:postgresql:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {
testImplementation project(":airbyte-json-validation")
testImplementation project(':airbyte-test-utils')

testImplementation 'org.testcontainers:postgresql:1.15.1'
testImplementation 'org.testcontainers:postgresql:1.15.3'

integrationTestJavaImplementation project(':airbyte-integrations:bases:standard-source-test')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
testImplementation project(':airbyte-test-utils')

testImplementation "org.postgresql:postgresql:42.2.18"
testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"

implementation files(project(':airbyte-integrations:bases:base-java').airbyteDocker.outputs)
}
Expand Down
3 changes: 2 additions & 1 deletion airbyte-migration/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim AS migrate
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim AS migrate

ENV APPLICATION airbyte-migration

Expand Down
3 changes: 2 additions & 1 deletion airbyte-scheduler/app/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim AS scheduler
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim AS scheduler

ENV APPLICATION airbyte-scheduler

Expand Down
2 changes: 1 addition & 1 deletion airbyte-scheduler/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
implementation project(':airbyte-scheduler:persistence')
implementation project(':airbyte-workers')

testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"
}

application {
Expand Down
2 changes: 1 addition & 1 deletion airbyte-scheduler/persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ dependencies {
implementation project(':airbyte-scheduler:models')

testImplementation "org.flywaydb:flyway-core:7.14.0"
testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"
}
3 changes: 2 additions & 1 deletion airbyte-secrets-migration/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim

ENV APPLICATION airbyte-secrets-migration
WORKDIR /airbyte
Expand Down
2 changes: 1 addition & 1 deletion airbyte-secrets-migration/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies {
implementation project(':airbyte-config:persistence')
testImplementation project(':airbyte-json-validation')
testImplementation 'org.apache.commons:commons-lang3:3.11'
testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"
integrationTestJavaImplementation project(':airbyte-secrets-migration')
}

3 changes: 2 additions & 1 deletion airbyte-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM openjdk:14.0.2-slim AS server
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim AS server

EXPOSE 8000

Expand Down
4 changes: 2 additions & 2 deletions airbyte-server/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'application'
id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'com.github.johnrengelman.shadow' version '7.1.0'
}

shadowJar {
Expand Down Expand Up @@ -81,7 +81,7 @@ dependencies {

testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.1'

testImplementation "org.testcontainers:postgresql:1.15.1"
testImplementation "org.testcontainers:postgresql:1.15.3"
}

// we want to be able to access the generated db files from config/init when we build the server docker image.
Expand Down
2 changes: 1 addition & 1 deletion airbyte-test-utils/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ plugins {
dependencies {
implementation project(':airbyte-db:lib')

implementation 'org.testcontainers:postgresql:1.15.1'
implementation 'org.testcontainers:postgresql:1.15.3'
implementation "org.testcontainers:cockroachdb:1.15.3"
}
2 changes: 1 addition & 1 deletion airbyte-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ dependencies {
acceptanceTestsImplementation 'com.fasterxml.jackson.core:jackson-databind'
acceptanceTestsImplementation 'io.github.cdimascio:java-dotenv:3.0.0'
acceptanceTestsImplementation 'org.apache.commons:commons-csv:1.4'
acceptanceTestsImplementation 'org.testcontainers:postgresql:1.15.1'
acceptanceTestsImplementation 'org.testcontainers:postgresql:1.15.3'
acceptanceTestsImplementation 'org.postgresql:postgresql:42.2.18'

automaticMigrationAcceptanceTestImplementation project(':airbyte-api')
Expand Down
4 changes: 3 additions & 1 deletion airbyte-webapp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ plugins {
id "com.github.node-gradle.node" version "3.1.1"
}

def nodeVersion = System.getenv('NODE_VERSION') ?: '14.11.0'

node {
download = true
version = "14.11.0"
version = nodeVersion
}

npm_run_build {
Expand Down
9 changes: 6 additions & 3 deletions airbyte-workers/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
FROM openjdk:14.0.2-slim AS worker
ARG JDK_VERSION=14.0.2
FROM openjdk:${JDK_VERSION}-slim AS worker

ARG ARCH=amd64

# Install Docker to launch worker images. Eventually should be replaced with Docker-java.
# See https://gitter.im/docker-java/docker-java?at=5f3eb87ba8c1780176603f4e for more information on why we are not currently using Docker-java
Expand All @@ -10,7 +13,7 @@ RUN apt-get update && apt-get install -y \
software-properties-common
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
RUN add-apt-repository \
"deb [arch=amd64] https://download.docker.com/linux/debian \
"deb [arch=${ARCH}] https://download.docker.com/linux/debian \
$(lsb_release -cs) \
stable"
RUN apt-get update && apt-get install -y docker-ce-cli jq
Expand All @@ -20,7 +23,7 @@ ENV APPLICATION airbyte-workers
WORKDIR /app

# Install kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.14/bin/linux/amd64/kubectl
RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v1.17.14/bin/linux/${ARCH}/kubectl
RUN chmod +x ./kubectl
RUN mv ./kubectl /usr/local/bin

Expand Down
Loading