From 8e5583d80ef16c07d11c3b3fe5149f54e458fc6d Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Thu, 19 Mar 2020 22:38:25 +0200
Subject: [PATCH] unified
---
.gitlab-ci.yml | 2 +-
Dockerfile | 24 ++++++++++++++++++++----
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dee57be..950816b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,7 +44,7 @@ manifest:
IMAGE_ppc64le: $CI_REGISTRY/$CI_PROJECT_NAMESPACE/$CI_PROJECT_NAME/ppc64le:$CI_COMMIT_REF_NAME
stage: manifest
tags:
- - amd64
+ - script
script:
- docker manifest create $IMAGE $IMAGE_amd64 $IMAGE_ppc64le
- docker manifest push $IMAGE
diff --git a/Dockerfile b/Dockerfile
index 558c70e..570612c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,24 @@
FROM buildpack-deps:buster-curl
-RUN apt-get update && apt-get install -y ca-certificates libgs9 mime-support && \
-apt-get clean autoclean && \
-apt-get autoremove --yes && \
-rm -rf /var/lib/{apt,dpkg,cache,log}
+RUN apt-get update && apt-get install -y ca-certificates libgs9 mime-support \
+ && apt-get clean autoclean \
+ && apt-get autoremove --yes \
+ && rm -rf /var/lib/apt/lists/* \
+ && groupadd -g 1001 vereign && useradd -u 1001 -g vereign vereign
+WORKDIR /srv
+
+
+ONBUILD ARG CI_COMMIT_REF_NAME
+ONBUILD ARG CI_COMMIT_SHA
+
+ONBUILD ARG CI_PROJECT_NAME
+ONBUILD ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
+
+ONBUILD ARG CI_PROJECT_NAMESPACE
+ONBUILD ENV CI_PROJECT_NAMESPACE ${CI_PROJECT_NAMESPACE}
+
+ONBUILD LABEL project=$CI_PROJECT_NAME-$CI_COMMIT_REF_NAME
+
+USER vereign
--
GitLab