Set short tag

msyea · msyea · commit 1ccc398c12a8 · 2021-02-13T13:48:02.000Z
diff --git a/.github/workflows/docker-registry-publish.yml b/.github/workflows/docker-registry-publish.yml
@@ -1,15 +1,15 @@
 name: Publish Docker image
 on:
   push:
-    branches:
-      - main
+
 jobs:
   push_docker:
     name: Push Ubuntu Docker image to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+      - run: echo "GIT_SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -19,7 +19,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: ./Dockerfile.docker
-          tags: msyea/ubuntu-docker
+          tags: msyea/ubuntu-docker:$GIT_SHORT_SHA
           push: true
   push_dind:
     needs: push_docker
@@ -28,6 +28,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+      - run: echo "GIT_SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -37,15 +38,17 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           file: ./Dockerfile.dind
-          tags: msyea/ubuntu-dind
+          tags: msyea/ubuntu-dind:$GIT_SHORT_SHA
           push: true
+          build-args: TAG=$GIT_SHORT_SHA
   push_gha:
     needs: [push_docker, push_dind]
     name: Push GitHub Actions runner image to Docker Hub
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
         uses: actions/checkout@v2
+      - run: echo "GIT_SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
@@ -54,5 +57,6 @@ jobs:
       - name: Push to Docker Hub
         uses: docker/build-push-action@v2
         with:
-          tags: msyea/github-actions-runner
+          tags: msyea/github-actions-runner:$GIT_SHORT_SHA
           push: true
+          build-args: TAG=$GIT_SHORT_SHA
diff --git a/.github/workflows/github-packages-publish.yml b/.github/workflows/github-packages-publish.yml
@@ -1,6 +1,8 @@
 name: Publish Docker image to GitHub
 on:
   push:
+    branches:
+      - main
 
 jobs:
   push_docker:
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,6 @@
 ARG REGISTRY=msyea
-FROM ${REGISTRY}/ubuntu-dind
+ARG TAG=latest
+FROM ${REGISTRY}/ubuntu-dind:${TAG}
 
 # "/run/user/UID" will be used by default as the value of XDG_RUNTIME_DIR
 RUN mkdir /run/user && chmod 1777 /run/user
diff --git a/Dockerfile.dind b/Dockerfile.dind
@@ -4,7 +4,8 @@
 # PLEASE DO NOT EDIT IT DIRECTLY.
 #
 ARG REGISTRY=msyea
-FROM ${REGISTRY}/ubuntu-docker
+ARG TAG=latest
+FROM ${REGISTRY}/ubuntu-docker:${TAG}
 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
 ENV DEBIAN_FRONTEND=noninteractive

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`	`# PLEASE DO NOT EDIT IT DIRECTLY.`
`5`	`5`	`#`
`6`	`6`	`ARG REGISTRY=msyea`
`7`		`-FROM ${REGISTRY}/ubuntu-docker`
	`7`	`+ARG TAG=latest`
	`8`	`+FROM ${REGISTRY}/ubuntu-docker:${TAG}`
`8`	`9`
`9`	`10`	`# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies`
`10`	`11`	`ENV DEBIAN_FRONTEND=noninteractive`