From 9ba2fa08ded0b4b7fbc1cb7904346d3083841f67 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 10 Aug 2024 20:35:41 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile Dockerfile.8 Dockerfile.9 --- Dockerfile | 3 +-- Dockerfile.8 | 3 +-- Dockerfile.9 | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0a2eb6..e2c47ff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -204,7 +204,6 @@ ARG PHP_VERSION ARG PHP_SERVER ARG LICENSE="WTFPL" ARG ENV_PORTS="" -ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')" USER ${USER} WORKDIR /root @@ -222,7 +221,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/almalinux" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/almalinux" LABEL org.opencontainers.image.vcs-type="Git" -LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}" +LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdev/almalinux" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/almalinux" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.8 b/Dockerfile.8 index 7cee5fa..c0fcafd 100644 --- a/Dockerfile.8 +++ b/Dockerfile.8 @@ -204,7 +204,6 @@ ARG PHP_VERSION ARG PHP_SERVER ARG LICENSE="WTFPL" ARG ENV_PORTS="" -ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')" USER ${USER} WORKDIR /root @@ -222,7 +221,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.vcs-type="Git" -LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}" +LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/almalinux" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.9 b/Dockerfile.9 index e7277ab..49668ef 100644 --- a/Dockerfile.9 +++ b/Dockerfile.9 @@ -204,7 +204,6 @@ ARG PHP_VERSION ARG PHP_SERVER ARG LICENSE="WTFPL" ARG ENV_PORTS="" -ARG GIT_VERSION="$(git -C . show-ref --head --dereference 2>/dev/null|grep ' HEAD' |awk -F' ' '{print $1}')" USER ${USER} WORKDIR /root @@ -222,7 +221,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.vcs-type="Git" -LABEL org.opencontainers.image.vcs-ref="${GIT_VERSION}" +LABEL org.opencontainers.image.vcs-ref="${BUILD_VERSION}" LABEL org.opencontainers.image.vcs-url="https://github.com/casjaysdevdocker/almalinux" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/almalinux" LABEL com.github.containers.toolbox="false"