From 15157a7942620ff368dff49c957d2e31ab05aaf3 Mon Sep 17 00:00:00 2001 From: casjay Date: Sat, 10 Aug 2024 20:36:12 -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.10 Dockerfile.11 Dockerfile.12 Dockerfile.13 --- Dockerfile | 3 +-- Dockerfile.10 | 3 +-- Dockerfile.11 | 3 +-- Dockerfile.12 | 3 +-- Dockerfile.13 | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5628e7f..4786817 100644 --- a/Dockerfile +++ b/Dockerfile @@ -208,7 +208,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 @@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdev/debian" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdev/debian" 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/debian" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdev/debian" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.10 b/Dockerfile.10 index e48a151..5bb2c2b 100644 --- a/Dockerfile.10 +++ b/Dockerfile.10 @@ -208,7 +208,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 @@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/debian" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/debian" 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/debian" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/debian" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.11 b/Dockerfile.11 index 08ba107..23f8585 100644 --- a/Dockerfile.11 +++ b/Dockerfile.11 @@ -208,7 +208,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 @@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/debian" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/debian" 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/debian" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/debian" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.12 b/Dockerfile.12 index dd27a03..f4f6941 100644 --- a/Dockerfile.12 +++ b/Dockerfile.12 @@ -208,7 +208,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 @@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/debian" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/debian" 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/debian" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/debian" LABEL com.github.containers.toolbox="false" diff --git a/Dockerfile.13 b/Dockerfile.13 index 1a34a13..c798e41 100644 --- a/Dockerfile.13 +++ b/Dockerfile.13 @@ -208,7 +208,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 @@ -226,7 +225,7 @@ LABEL org.opencontainers.image.schema-version="${BUILD_VERSION}" LABEL org.opencontainers.image.url="https://hub.docker.com/r/casjaysdevdocker/debian" LABEL org.opencontainers.image.url.source="https://hub.docker.com/r/casjaysdevdocker/debian" 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/debian" LABEL org.opencontainers.image.documentation="https://github.com/casjaysdevdocker/debian" LABEL com.github.containers.toolbox="false"