Worflow fixes

ckan · Jul 2, 2024 · 40234d5 · 40234d5
1 parent 2acd1c3
commit 40234d5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/publish-docker-2.10-py3.yml b/.github/workflows/publish-docker-2.10-py3.yml
@@ -8,5 +8,6 @@ jobs:
     with:
       ckan-major-version: "2.10"
       ckan-version: "2.10.4"
+      docker-file: "Dockerfile.py3.9"
       base-tags: '["ckan/ckan-base:2.10-py3.10", "ckan/ckan-base:2.10.4-py3.10"]'
       dev-tags: '["ckan/ckan-dev:2.10-py3.10", "ckan/ckan-dev:2.10.4-py3.10"]'
diff --git a/.github/workflows/publish-docker-2.9-py3.yml b/.github/workflows/publish-docker-2.9-py3.yml
@@ -8,5 +8,6 @@ jobs:
     with:
       ckan-major-version: "2.9"
       ckan-version: "2.9.11"
+      docker-file: "Dockerfile.py3.9"
       base-tags: '["ckan/ckan-base:2.9-py3.9", "ckan/ckan-base:2.9.11-py3.9"]'
       dev-tags: '["ckan/ckan-dev:2.9-py3.9", "ckan/ckan-dev:2.9.11-py3.9"]'
diff --git a/.github/workflows/publish-docker-master.yml b/.github/workflows/publish-docker-master.yml
@@ -3,10 +3,11 @@ on:
   schedule:
     - cron: '15 5 * * *'
 
-call-reusable-workflow:
-  uses: ./.github/workflows/reusable-docker-publish.yml
-  with:
-    ckan-major-version: "master"
-    ckan-version: "master"
-    base-tags: '["ckan/ckan-base:master", "ckan/ckan-base:master-py3.10"]'
-    dev-tags: '["ckan/ckan-dev:master", "ckan/ckan-dev:master-py3.10"]'
+jobs:
+  call-reusable-workflow:
+    uses: ./.github/workflows/reusable-docker-publish.yml
+    with:
+      ckan-major-version: "master"
+      ckan-version: "master"
+      base-tags: '["ckan/ckan-base:master", "ckan/ckan-base:master-py3.10"]'
+      dev-tags: '["ckan/ckan-dev:master", "ckan/ckan-dev:master-py3.10"]'
diff --git a/.github/workflows/reusable-docker-publish.yml b/.github/workflows/reusable-docker-publish.yml
@@ -18,6 +18,7 @@ on:
       docker-file:
         required: false
         default: 'Dockerfile'
+        type: string
 
 jobs:
   build: