Revert "have docker-compose.build.yaml to use new docker context (air…

…bytehq#7696)" (airbytehq#7697) This reverts commit b5af3f1.
schlattk · Jan 4, 2022 · 386ea10 · 386ea10
1 parent 2405be0
commit 386ea10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/docker-compose.build-m1.yaml b/docker-compose.build-m1.yaml
@@ -14,15 +14,15 @@ services:
     image: airbyte/init:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-config/init/build/docker
+      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/build/docker
+      context: airbyte-db/lib
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   scheduler:
@@ -32,7 +32,7 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-scheduler/app/build/docker
+      context: airbyte-scheduler/app
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   worker:
@@ -43,7 +43,7 @@ services:
       args:
         ARCH: ${DOCKER_BUILD_ARCH}
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-workers/build/docker
+      context: airbyte-workers
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   server:
@@ -53,15 +53,15 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-server/build/docker
+      context: airbyte-server
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   webapp:
     platform: linux/amd64
     image: airbyte/webapp:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-webapp/build/docker
+      context: airbyte-webapp
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   migration:
@@ -71,6 +71,6 @@ services:
       dockerfile: Dockerfile
       args:
         JDK_VERSION: ${JDK_VERSION}
-      context: airbyte-migration/build/docker
+      context: airbyte-migration
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml
@@ -5,48 +5,48 @@ services:
     image: airbyte/init:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-config/init/build/docker
+      context: airbyte-config/init
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   db:
     image: airbyte/db:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-db/lib/build/docker
+      context: airbyte-db/lib
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   scheduler:
     image: airbyte/scheduler:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-scheduler/app/build/docker
+      context: airbyte-scheduler/app
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   worker:
     image: airbyte/worker:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-workers/build/docker
+      context: airbyte-workers
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   server:
     image: airbyte/server:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-server/build/docker
+      context: airbyte-server
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   webapp:
     image: airbyte/webapp:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-webapp/build/docker
+      context: airbyte-webapp
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}
   migration:
     image: airbyte/migration:${VERSION}
     build:
       dockerfile: Dockerfile
-      context: airbyte-migration/build/docker
+      context: airbyte-migration
       labels:
         io.airbyte.git-revision: ${GIT_REVISION}