Use local tags

ckan · Nov 18, 2024 · 516b0d1 · 516b0d1
1 parent ad1845b
commit 516b0d1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 24 deletions.
diff --git a/.github/workflows/build-and-test-2.10-py3.yml b/.github/workflows/build-and-test-2.10-py3.yml
@@ -7,6 +7,4 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "2.10"
-      base-tag: "ckan/ckan-base:2.10"
-      dev-tag: "ckan/ckan-dev:2.10"
       docker-file: "Dockerfile.py3.10"
diff --git a/.github/workflows/build-and-test-2.10.yml b/.github/workflows/build-and-test-2.10.yml
@@ -7,5 +7,3 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "2.10"
-      base-tag: "ckan/ckan-base:2.10"
-      dev-tag: "ckan/ckan-dev:2.10"
diff --git a/.github/workflows/build-and-test-2.11.yml b/.github/workflows/build-and-test-2.11.yml
@@ -7,5 +7,3 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "2.11"
-      base-tag: "ckan/ckan-base:2.11"
-      dev-tag: "ckan/ckan-dev:2.11"
diff --git a/.github/workflows/build-and-test-2.9-py3.yml b/.github/workflows/build-and-test-2.9-py3.yml
@@ -7,6 +7,4 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "2.9"
-      base-tag: "ckan/ckan-base:2.9"
-      dev-tag: "ckan/ckan-dev:2.9"
       docker-file: "Dockerfile.py3.9"
diff --git a/.github/workflows/build-and-test-2.9.yml b/.github/workflows/build-and-test-2.9.yml
@@ -7,5 +7,3 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "2.9"
-      base-tag: "ckan/ckan-base:2.9"
-      dev-tag: "ckan/ckan-dev:2.9"
diff --git a/.github/workflows/build-and-test-master.yml b/.github/workflows/build-and-test-master.yml
@@ -7,5 +7,3 @@ jobs:
     uses: ./.github/workflows/reusable-build-and-test.yml
     with:
       ckan-major-version: "master"
-      base-tag: "ckan/ckan-base:master"
-      dev-tag: "ckan/ckan-dev:master"
diff --git a/.github/workflows/reusable-build-and-test.yml b/.github/workflows/reusable-build-and-test.yml
@@ -6,16 +6,10 @@ on:
       ckan-major-version:
         required: true
         type: string
-      base-tag:
-        required: true
-        type: string
-      dev-tag:
-        required: true
-        type: string
-      docker-file:
+     docker-file:
         required: false
         default: 'Dockerfile'
-        type: string  
+        type: string
 
 jobs:
   build_and_test:
@@ -66,7 +60,7 @@ jobs:
             CKAN_REF=${{ env.CKAN_REF }}
             ENV=base
           tags: |
-            ${{ inputs.base-tag }}
+            ckan-base-${{ inputs.ckan-major-version }}-local
 
       - name: Test base image
         run: |
@@ -80,7 +74,7 @@ jobs:
             -e CKAN_REDIS_URL=redis://localhost:6379/1 \
             -e CKAN_INI=/srv/app/src/ckan/test-core.ini \
             --entrypoint "" \
-            ${{ inputs.base-tag }} \
+            ckan-base-${{ inputs.ckan-major-version }}-local \
             ckan --help
 
       - name: Build dev image
@@ -94,7 +88,7 @@ jobs:
             CKAN_REF=${{ env.CKAN_REF }}
             ENV=dev
           tags: |
-            ${{ inputs.dev-tag }} 
+            ckan-dev-${{ inputs.ckan-major-version }}-local
 
       - name: Test dev image
         run: |
@@ -108,5 +102,5 @@ jobs:
             -e CKAN_REDIS_URL=redis://localhost:6379/1 \
             -e CKAN_INI=/srv/app/src/ckan/test-core.ini \
             --entrypoint "" \
-            ${{ inputs.dev-tag }} \ 
+            ckan-dev-${{ inputs.ckan-major-version }}-local \
             pytest --ckan-ini=/srv/app/src/ckan/test-core.ini -v /srv/app/src/ckan/ckan/tests/logic/action/test_create.py::TestDatasetCreate