From 9a1b05b1ae6d0387313981fd63908d2ac70d86ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=B0?= =?UTF-8?q?=D1=84=D1=80=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Thu, 18 Apr 2024 21:24:17 +0300 Subject: [PATCH 1/2] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66627c7..cc415f9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,9 +10,9 @@ COPY --from=grype /grype /bin/grype RUN chmod a+x /bin/grype && \ mkdir -p ${GRYPE_DB_CACHE_DIR} && \ chmod -R 0777 ${GRYPE_DB_CACHE_DIR} -ARG CACHEBUST=static +ARG CACHEBUST RUN set -e; \ - TMP="${CACHEBUST}" grype db update -v || ( echo "Update failed!"; exit 1 ) + TMP="${CACHEBUST:-$(date -u +%s)}" grype db update -v || ( echo "Update failed!"; exit 1 ) FROM grype AS runtime ENV GRYPE_CHECK_FOR_APP_UPDATE="false" \ -- GitLab From 1681023012d0f080bc5437bc66579bef7db3e0d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A1=D0=B0?= =?UTF-8?q?=D1=84=D1=80=D0=BE=D0=BD=D0=BE=D0=B2?= Date: Thu, 18 Apr 2024 21:31:50 +0300 Subject: [PATCH 2/2] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc415f9..96baa10 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ ARG DOCKER_REGISTRY=registry.cyberbrain.pw FROM anchore/grype:latest AS grype -FROM $DOCKER_REGISTRY/tools/docker/alpine:latest AS loader + +FROM $DOCKER_REGISTRY/tools/docker/alpine/main:latest AS loader SHELL ["/bin/ash", "-euo", "pipefail", "-c"] ENV GRYPE_CHECK_FOR_APP_UPDATE="false" \ GRYPE_DB_CACHE_DIR="/tmp/db" \ -- GitLab