Skip to content

Commit

Permalink
Restore platform option in m1-specific docker compose file (airbytehq…
Browse files Browse the repository at this point in the history
…#7188)

* Revert "remove platform option temporarily to fix master build (airbytehq#7184)"

This reverts commit d9e7bdc.

* Test if docker compose works in github action

* Use a dedicated docker compose file for m1

* Restore docker-compose command

* Update comments

* Fix docker compose filename

* Add issue link
  • Loading branch information
tuliren authored and schlattk committed Jan 4, 2022
1 parent 4935b98 commit 3a0cf27
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,11 @@ task composeBuild {
def buildPlatform = System.getenv('DOCKER_BUILD_PLATFORM') ?: 'linux/amd64'
def buildArch = System.getenv('DOCKER_BUILD_ARCH') ?: 'amd64'
def jdkVersion = System.getenv('JDK_VERSION') ?: '14.0.2'
def dockerComposeFile = buildArch == 'arm64' ? 'docker-compose.build-m1.yaml' : 'docker-compose.build.yaml'
doFirst {
exec {
workingDir rootDir
commandLine 'docker-compose', '-f', 'docker-compose.build.yaml', 'build', '--parallel', '--quiet'
commandLine 'docker-compose', '-f', dockerComposeFile, 'build', '--parallel', '--quiet'
environment 'VERSION', buildTag
environment 'DOCKER_BUILD_PLATFORM', buildPlatform
environment 'DOCKER_BUILD_ARCH', buildArch
Expand Down
76 changes: 76 additions & 0 deletions docker-compose.build-m1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# This file is exactly the same as docker-compose.build.yaml, except
# that it specifies the platform. This is a temporary solution for M1
# Mac computers. The platform option is required for M1 users to build
# the project. However, currently, our Github Action runner has an old
# version of docker-compose, which does not support this option. Once
# we upgrade the docker-compose in the runners, we should delete this file.
# Issue: https://github.com/airbytehq/airbyte/issues/7191

version: "3.7"

services:
init:
platform: linux/amd64
image: airbyte/init:${VERSION}
build:
dockerfile: Dockerfile
context: airbyte-config/init
labels:
io.airbyte.git-revision: ${GIT_REVISION}
db:
platform: linux/amd64
image: airbyte/db:${VERSION}
build:
dockerfile: Dockerfile
context: airbyte-db/lib
labels:
io.airbyte.git-revision: ${GIT_REVISION}
scheduler:
platform: ${DOCKER_BUILD_PLATFORM}
image: airbyte/scheduler:${VERSION}
build:
dockerfile: Dockerfile
args:
JDK_VERSION: ${JDK_VERSION}
context: airbyte-scheduler/app
labels:
io.airbyte.git-revision: ${GIT_REVISION}
worker:
platform: ${DOCKER_BUILD_PLATFORM}
image: airbyte/worker:${VERSION}
build:
dockerfile: Dockerfile
args:
ARCH: ${DOCKER_BUILD_ARCH}
JDK_VERSION: ${JDK_VERSION}
context: airbyte-workers
labels:
io.airbyte.git-revision: ${GIT_REVISION}
server:
platform: ${DOCKER_BUILD_PLATFORM}
image: airbyte/server:${VERSION}
build:
dockerfile: Dockerfile
args:
JDK_VERSION: ${JDK_VERSION}
context: airbyte-server
labels:
io.airbyte.git-revision: ${GIT_REVISION}
webapp:
platform: linux/amd64
image: airbyte/webapp:${VERSION}
build:
dockerfile: Dockerfile
context: airbyte-webapp
labels:
io.airbyte.git-revision: ${GIT_REVISION}
migration:
platform: ${DOCKER_BUILD_PLATFORM}
image: airbyte/migration:${VERSION}
build:
dockerfile: Dockerfile
args:
JDK_VERSION: ${JDK_VERSION}
context: airbyte-migration
labels:
io.airbyte.git-revision: ${GIT_REVISION}

0 comments on commit 3a0cf27

Please sign in to comment.