Keep an admintools version separate from temporal version. (#207)

* Keep an admintools version separate from temporal version. This allows us to account for new admintools tagging format. * Adjust release action to take an admintools version.
temporalio · Jun 5, 2024 · 52f74c5 · 52f74c5
1 parent 1f95f48
commit 52f74c5
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 9 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,7 @@ CASSANDRA_VERSION=3.11.9
 ELASTICSEARCH_VERSION=7.16.2
 MYSQL_VERSION=8
 TEMPORAL_VERSION=1.24.0
+TEMPORAL_ADMINTOOLS_VERSION=1.24.0-tctl-1.18.1-cli-0.12.0
 TEMPORAL_UI_VERSION=2.26.2
 POSTGRESQL_VERSION=13
 POSTGRES_PASSWORD=temporal

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
@@ -6,6 +6,9 @@ on:
       tag:
         description: "Tag for new version (1.23.4)"
         required: true
+      admintools_tag:
+        description: "Admin tools version (1.23.4-tctl-1.0-cli-1.0)"
+        required: true
 
 jobs:
   create-tag:
@@ -40,8 +43,10 @@ jobs:
       - name: Update images version
         env:
           TAG: ${{ github.event.inputs.tag }}
+          ADMINTOOLS_TAG: ${{ github.event.inputs.admintools_tag }}
         run: |
           sed -i -e "s/^TEMPORAL_VERSION=.*$/TEMPORAL_VERSION=$TAG/g" .env
+          sed -i -e "s/^TEMPORAL_ADMINTOOLS_VERSION=.*$/TEMPORAL_ADMINTOOLS_VERSION=$ADMINTOOLS_TAG/g" .env
           if [ -n "$(git diff --stat)" ]; then
             git add .
             git commit -m "Bump Server version to $TAG"

diff --git a/docker-compose-cass-es.yml b/docker-compose-cass-es.yml
@@ -53,7 +53,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-cockroach-es.yml b/docker-compose-cockroach-es.yml
@@ -67,7 +67,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-cockroach.yml b/docker-compose-cockroach.yml
@@ -46,7 +46,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-multirole.yaml b/docker-compose-multirole.yaml
@@ -236,7 +236,7 @@ services:
     environment:
       - TEMPORAL_CLI_ADDRESS=temporal-nginx:7233
       - TEMPORAL_ADDRESS=temporal-nginx:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     stdin_open: true
     tty: true
     networks:

diff --git a/docker-compose-mysql-es.yml b/docker-compose-mysql-es.yml
@@ -58,7 +58,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
@@ -38,7 +38,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-postgres-opensearch.yml b/docker-compose-postgres-opensearch.yml
@@ -67,7 +67,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml
@@ -39,7 +39,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -60,7 +60,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:${TEMPORAL_VERSION}
+    image: temporalio/admin-tools:${TEMPORAL_ADMINTOOLS_VERSION}
     networks:
       - temporal-network
     stdin_open: true