From 6bff97a78699390dd446eef315e4482222ae29e3 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Mon, 25 Nov 2019 19:11:04 -0600 Subject: [PATCH 1/4] work clean up build --- .gitlab-ci.yml | 37 ++++--------------------------------- Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7688ab4..143c821 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,36 +1,7 @@ -image: docker:latest - variables: VERSION: v2.16.1 -services: - - docker:18-dind - -before_script: - - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - -build-master: - stage: build - script: - - docker pull $CI_REGISTRY_IMAGE:$VERSION - - docker tag $CI_REGISTRY_IMAGE:$VERSION $CI_REGISTRY_IMAGE:latest - - docker push $CI_REGISTRY_IMAGE:latest - only: - - master - tags: - - docker - -build: - stage: build - script: - - - docker build - --build-arg REF_NAME=$CI_COMMIT_REF_NAME - --build-arg VCS_REF=$CI_COMMIT_REF_SLUG - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` - -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME . - - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME - except: - - master - tags: - - docker \ No newline at end of file +include: + - project: "io_determan/ci-templates" + ref: "master" + file: "/gitlab/.docker.file.yml" \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 807d0dc..5cf1151 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,12 +22,10 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* ARG REF_SLUG -ARG BUILD_DATE # Metadata LABEL org.label-schema.vcs-ref=$REF_SLUG \ org.label-schema.vcs-url="https://github.com/mdeterman/docker/k8s-helm" \ - org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" COPY --from=helm-builder /root/linux-amd64/helm /usr/local/bin @@ -40,4 +38,6 @@ RUN dpkg -i /sops_amd64.deb && \ RUN mkdir -p /etc/deploy && \ helm init --client-only && \ - helm repo add io-determan https://io-determan-charts.storage.googleapis.com \ No newline at end of file + helm repo add io-determan https://io-determan-charts.storage.googleapis.com + +CMD ["helm"] \ No newline at end of file -- GitLab From 708a32eb99dc2238debf8c8dfece0f59ede4eb4e Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 26 Nov 2019 09:18:27 -0600 Subject: [PATCH 2/4] update sops version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5cf1151..6d1f6b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster as helm-builder ARG REF_NAME -ARG SOPS_VER=3.2.0 +ARG SOPS_VER=3.5.0 ENV HELM_VERSION=$REF_NAME ENV SOPS_VERSION=$SOPS_VER -- GitLab From 533cebdaa1d5779b0cf3b65d839d8b329b8ffeb8 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 26 Nov 2019 15:35:45 +0000 Subject: [PATCH 3/4] Fix Sops Version --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d1f6b3..a757024 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster as helm-builder ARG REF_NAME -ARG SOPS_VER=3.5.0 +ARG SOPS_VER=v3.5.0 ENV HELM_VERSION=$REF_NAME ENV SOPS_VERSION=$SOPS_VER @@ -40,4 +40,4 @@ RUN mkdir -p /etc/deploy && \ helm init --client-only && \ helm repo add io-determan https://io-determan-charts.storage.googleapis.com -CMD ["helm"] \ No newline at end of file +CMD ["helm"] -- GitLab From c5437bc1ae14fb0a4a123a97c0890c8fe3721347 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 26 Nov 2019 15:40:23 +0000 Subject: [PATCH 4/4] Fix Sops Version --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a757024..e2badd5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM debian:buster as helm-builder ARG REF_NAME -ARG SOPS_VER=v3.5.0 +ARG SOPS_VER=3.4.0 ENV HELM_VERSION=$REF_NAME ENV SOPS_VERSION=$SOPS_VER -- GitLab