From f762fd0aea0d8a5dae6ef67c9de792a49add1bf7 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Fri, 13 Mar 2020 13:31:00 +0200
Subject: [PATCH] tag and remove images
---
.gitlab-ci.yml | 3 ++-
Dockerfile | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81504b6..92978e6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,7 +20,8 @@ before_script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
after_script:
- - "docker rmi $MANIFEST $IMAGE_amd64 $IMAGE_ppc64le || true"
+ - "docker image prune -f --filter label=intermediate=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME"
+ - "docker image prune -f --filter label=final=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME"
- "rm -vRf $DOCKER_CONFIG"
ppc64le:
diff --git a/Dockerfile b/Dockerfile
index d490aab..11d3134 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,6 +10,7 @@ ENV PATH "$PATH:/srv/bin/"
ARG CI_PROJECT_NAME
ARG CI_COMMIT_REF_NAME
ARG CI_COMMIT_SHA
+LABEL intermediate=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
@@ -27,6 +28,8 @@ FROM buildpack-deps:buster-curl
ARG CI_PROJECT_NAME
ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
+ARG CI_COMMIT_REF_NAME
+LABEL final=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
COPY --from=0 /srv/${CI_PROJECT_NAME} /srv/${CI_PROJECT_NAME}
--
GitLab