Tag CI image on push with the date (#361)

cloudfoundry · Mar 14, 2024 · 5a50b24 · 5a50b24
1 parent fa50f93
commit 5a50b24
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/.github/workflows/build-buildpacks-ci-image.yml b/.github/workflows/build-buildpacks-ci-image.yml
@@ -26,8 +26,12 @@ jobs:
           username: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_TOKEN }}
 
+      - name: Get current date
+        id: get-date
+        run: echo "::set-output name=date::$(date +'%Y.%m.%d')"
+
       - name: Build and push
         uses: docker/build-push-action@v3
         with:
           push: true
-          tags: cfbuildpacks/ci
+          tags: cfbuildpacks/ci:latest, cfbuildpacks/ci:${{ steps.get-date.outputs.date }}
diff --git a/.github/workflows/build-test-on-jammy-image.yml b/.github/workflows/build-test-on-jammy-image.yml
@@ -26,10 +26,14 @@ jobs:
           username: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_USERNAME }}
           password: ${{ secrets.CF_BUILDPACKS_DOCKERHUB_TOKEN }}
 
+      - name: Get current date
+        id: get-date
+        run: echo "::set-output name=date::$(date +'%Y.%m.%d')"
+
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
           context: .
           push: true
-          tags: cfbuildpacks/test-on-jammy
           file: dockerfiles/test-on-jammy.Dockerfile
+          tags: cfbuildpacks/test-on-jammy:latest, cfbuildpacks/test-on-jammy:${{ steps.get-date.outputs.date }}
diff --git a/dockerfiles/test-on-jammy.Dockerfile b/dockerfiles/test-on-jammy.Dockerfile
@@ -72,11 +72,9 @@ COPY build/*.sh /etc/profile.d/
 # Ensure that Concourse filtering is on for non-interactive shells
 ENV BASH_ENV /etc/profile.d/filter.sh
 
-RUN cd /usr/local \
-  && curl -L https://go.dev/dl/go1.20.8.linux-amd64.tar.gz -o go.tar.gz \
-  && [ cc97c28d9c252fbf28f91950d830201aa403836cbed702a05932e63f7f0c7bc4 = $(shasum -a 256 go.tar.gz | cut -d' ' -f1) ] \
-  && tar xf go.tar.gz \
-  && rm go.tar.gz
+RUN export GO_VERSION=$(wget -qO- https://golang.org/dl/\?mode\=json | jq -r '.[0].version' | sed 's/go//') && \
+    wget -q https://golang.org/dl/go$GO_VERSION.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go$GO_VERSION.linux-amd64.tar.gz
 
 ENV GOROOT=/usr/local/go
 ENV GOPATH=/go