From c698564f2a23b3d514e50b4de23976036bbba601 Mon Sep 17 00:00:00 2001
From: Alexey Kuklin <alex@kuklin.eu>
Date: Sun, 20 Dec 2020 08:11:18 +0200
Subject: [PATCH] devops-ci-refactor
---
.gitlab-ci.yml | 1 +
Dockerfile | 30 +++---------------------------
2 files changed, 4 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 44d3260..92706d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,3 +6,4 @@ include:
script:
- docker build --build-arg CI_COMMIT_SHA=$CI_COMMIT_SHA --build-arg CI_COMMIT_REF_NAME=$CI_COMMIT_REF_NAME --build-arg CI_PROJECT_NAME=$CI_PROJECT_NAME --build-arg GITLAB_LOGIN=gitlab-ci-token --build-arg GITLAB_PASSWORD=$CI_JOB_TOKEN --pull -t $JOB_IMAGE -f Dockerfile .
- docker push $JOB_IMAGE
+
diff --git a/Dockerfile b/Dockerfile
index d490aab..ecae4bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,14 @@
-FROM registry.vereign.com/docker/go-with-dep:with-codecgen
-
-ARG GITLAB_LOGIN
-ARG GITLAB_PASSWORD
-
-ENV GOPATH /srv/
-
-ENV PATH "$PATH:/srv/bin/"
-
-ARG CI_PROJECT_NAME
-ARG CI_COMMIT_REF_NAME
-ARG CI_COMMIT_SHA
-
-ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
-
-RUN mkdir -p /srv/src/code.vereign.com/code/$CI_PROJECT_NAME
-
-COPY . /srv/src/code.vereign.com/code/$CI_PROJECT_NAME/
+FROM registry.vereign.com/docker/go-with-dep:devops-ci-refactor
RUN cd /srv/src/code.vereign.com/code/$CI_PROJECT_NAME && \
- git config --global url."https://$GITLAB_LOGIN:$GITLAB_PASSWORD@code.vereign.com".insteadOf "https://code.vereign.com" && \
dep ensure && \
go generate vendor/github.com/coreos/etcd/client/keys.go && \
go build -ldflags="-X code.vereign.com/code/${CI_PROJECT_NAME}/handler.version=${CI_COMMIT_REF_NAME}.${CI_COMMIT_SHA}" -i -v -o /srv/${CI_PROJECT_NAME} code.vereign.com/code/${CI_PROJECT_NAME}
-FROM buildpack-deps:buster-curl
-
-ARG CI_PROJECT_NAME
-ENV CI_PROJECT_NAME ${CI_PROJECT_NAME}
+FROM registry.vereign.com/docker/go-runtime:devops-ci-refactor
COPY --from=0 /srv/${CI_PROJECT_NAME} /srv/${CI_PROJECT_NAME}
-WORKDIR /srv
-
-RUN mkdir -p /srv/src/code.vereign.com/code/key-storage-agent/bin/ && ln /srv/key-storage-agent /srv/src/code.vereign.com/code/key-storage-agent/bin/server && ln -s /srv/ /go
+ENTRYPOINT ["/srv/audit-log-agent"]
-ENTRYPOINT ["/srv/key-storage-agent"]
--
GitLab