Revert "Custom auto-setup temporal docker image (#7681)" (#7835)

This reverts commit e20d98f.
airbytehq · Nov 10, 2021 · 73a9131 · 73a9131
1 parent e20d98f
commit 73a9131
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 202 deletions.
diff --git a/airbyte-temporal/Dockerfile b/airbyte-temporal/Dockerfile
diff --git a/airbyte-temporal/README.md b/airbyte-temporal/README.md
diff --git a/airbyte-temporal/build.gradle b/airbyte-temporal/build.gradle
diff --git a/airbyte-temporal/scripts/update-and-start-temporal.sh b/airbyte-temporal/scripts/update-and-start-temporal.sh
diff --git a/build.gradle b/build.gradle
@@ -316,7 +316,6 @@ task('generate-docker') {
     dependsOn(':airbyte-migration:assemble')
     dependsOn(':airbyte-db:lib:assemble')
     dependsOn(':airbyte-config:init:assemble')
-    dependsOn(':airbyte-temporal:assemble')
 }
 
 // produce reproducible archives

diff --git a/docker-compose.debug.yaml b/docker-compose.debug.yaml
@@ -12,7 +12,7 @@ services:
     ports:
       - 8011:5432
   airbyte-temporal-ui:
-    image: temporalio/web:1.13.0
+    image: temporalio/web:latest
     logging: *default-logging
     container_name: airbyte-temporal-ui
     restart: unless-stopped

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -176,7 +176,7 @@ services:
       - OPENREPLAY=${OPENREPLAY:-}
       - PAPERCUPS_STORYTIME=${PAPERCUPS_STORYTIME:-}
   airbyte-temporal:
-    image: airbyte/temporal:${VERSION}
+    image: temporalio/auto-setup:1.7.0
     logging: *default-logging
     container_name: airbyte-temporal
     restart: unless-stopped

diff --git a/settings.gradle b/settings.gradle
@@ -61,7 +61,6 @@ if (!System.getenv().containsKey("SUB_BUILD") || System.getenv().get("SUB_BUILD"
     include ':airbyte-scheduler:app'
     include ':airbyte-scheduler:client'
     include ':airbyte-server'
-    include 'airbyte-temporal'
     include ':airbyte-tests'
     include ':airbyte-webapp'
     include ':airbyte-config:init'

diff --git a/tools/bin/test-temporal-migration.sh b/tools/bin/test-temporal-migration.sh