From 2d23ee3eb7bab7679c39106212b0c4a01c0091ba Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Thu, 13 Jul 2023 00:40:54 +0800
Subject: [PATCH] build: fix caching

---
 .github/workflows/docker-publish.yml | 2 --
 Dockerfile                           | 4 +---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 04d9546..52e9402 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -57,7 +57,5 @@ jobs:
           cache-to: type=registry,ref=${{ fromJSON(steps.meta.outputs.json).tags[0] }}-buildcache,mode=max
           platforms: linux/amd64,linux/arm64
           build-args: |
-            GITHUB_SHA=${{ github.sha }}
-            GITHUB_RUN_ID=${{ github.run_id }}
             GITHUB_SERVER_URL=${{ github.server_url }}
             GITHUB_REPOSITORY=${{ github.repository }}
diff --git a/Dockerfile b/Dockerfile
index 27d700c..97098d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -27,8 +27,6 @@ ENV GCC_MIRRORS \
 		https://ftpmirror.gnu.org/gcc
 
 ARG GCC_VERSION
-ARG GITHUB_SHA="dev-build"
-ARG GITHUB_RUN_ID="dev-build"
 ARG GITHUB_SERVER_URL=""
 ARG GITHUB_REPOSITORY=""
 
@@ -63,7 +61,7 @@ RUN set -ex; \
 		--prefix=/usr/um/gcc-${GCC_VERSION} \
 		--disable-multilib \
 		--enable-languages=c,c++ \
-		--with-pkgversion="Project CAENTainer, Rev $GITHUB_SHA, Build $GITHUB_RUN_ID" \
+		--with-pkgversion="Project CAENTainer, $GITHUB_SERVER_URL/$GITHUB_REPOSITORY" \
 		--with-bugurl="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/issues"; \
 	make -j"$(nproc)"; \
 	make install-strip; \