Merge pull request #133 from keitaroinc/change-image-tag-xloader

Change tag name for xloader image
keitaroinc · Aug 7, 2024 · 6966983 · 6966983
2 parents 39f3771 + 89eb53f
commit 6966983
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/.github/workflows/master_merge.yml b/.github/workflows/master_merge.yml
@@ -33,6 +33,7 @@ jobs:
           path: |
             /tmp/.buildx-cache-alpine-2-10
             /tmp/.buildx-cache-ubuntu-2-10
+            /tmp/.buildx-cache-alpine-2-10-xloader
           key: ${{ runner.os }}-buildx-2-10-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-2-10
@@ -66,10 +67,10 @@ jobs:
           file: ./images/ckan/2.10/Dockerfile.xloader
           push: true
           tags: |
-            keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-            ghcr.io/keitaroinc/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-10
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-10
+            keitaro/ckan:${{ steps.alpine-xloader.outputs.IMAGE_TAG }}
+            ghcr.io/keitaroinc/ckan:${{ steps.alpine-xloader.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-10-xloader
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-10-xloader
 
       - name: Get docker tag for Ubuntu image
         id: ubuntu

diff --git a/.github/workflows/pr_checks.yml b/.github/workflows/pr_checks.yml
@@ -20,6 +20,7 @@ jobs:
           path: |
             /tmp/.buildx-cache-alpine-2-10
             /tmp/.buildx-cache-ubuntu-2-10
+            /tmp/.buildx-cache-alpine-2-10-xloader
           key: ${{ runner.os }}-buildx-2-10-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-buildx-2-10
@@ -50,9 +51,9 @@ jobs:
           context: ./images/ckan/2.10
           file: ./images/ckan/2.10/Dockerfile.xloader
           push: false
-          tags: keitaro/ckan:${{ steps.alpine.outputs.IMAGE_TAG }}
-          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-10
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-10
+          tags: keitaro/ckan:${{ steps.alpine-xloader.outputs.IMAGE_TAG }}
+          cache-from: type=local,src=/tmp/.buildx-cache-alpine-2-10-xloader
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-alpine-2-10-xloader
 
       - name: Get docker tag for Ubuntu image
         id: ubuntu

diff --git a/images/ckan/2.10/Dockerfile.xloader b/images/ckan/2.10/Dockerfile.xloader
@@ -4,7 +4,7 @@
 FROM alpine:3.17.2 as ckanbuild
 
 # Used by Github Actions to tag the image with
-ENV IMAGE_TAG=2.10.4
+ENV IMAGE_TAG=2.10.4-xloader
 
 # Set CKAN version to build
 ENV GIT_URL=https://github.com/ckan/ckan.git