From 190a33901eb96d5bf9a35809683a4bedf73d1ccb Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 18 Sep 2018 18:24:00 -0500 Subject: [PATCH 1/5] make build more flexable --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 098b3b3..4b12169 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.8 as builder -ENV HELM_VERSION="v2.11.0-rc.3" +ARG VCS_REF + +ENV HELM_VERSION=$VCS_REF WORKDIR /root/ -- GitLab From e5f3ed32467964d69e4fa99bac76be79fd84dec2 Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 18 Sep 2018 18:30:18 -0500 Subject: [PATCH 2/5] git work on build --- .gitlab-ci.yml | 2 ++ Dockerfile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8038570..f749967 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ build-master: 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 . @@ -23,6 +24,7 @@ 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 . diff --git a/Dockerfile b/Dockerfile index 4b12169..3127236 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM alpine:3.8 as builder -ARG VCS_REF +ARG REF_NAME -ENV HELM_VERSION=$VCS_REF +ENV HELM_VERSION=$REF_NAME WORKDIR /root/ @@ -15,11 +15,11 @@ FROM alpine:3.8 LABEL maintainer="Mark Determan" -ARG VCS_REF +ARG REF_SLUG ARG BUILD_DATE # Metadata -LABEL org.label-schema.vcs-ref=$VCS_REF \ +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" -- GitLab From e6a94f2cab7ce58f611c058b221cc71a9b04b1ca Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 18 Sep 2018 18:51:24 -0500 Subject: [PATCH 3/5] work on gitlab ci --- Dockerfile | 3 +-- README.md | 8 ++++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 README.md diff --git a/Dockerfile b/Dockerfile index 3127236..44a8be8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,5 +26,4 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ COPY --from=builder /root/linux-amd64/helm /usr/local/bin -ENTRYPOINT ["helm"] -CMD ["help"] \ No newline at end of file +CMD ["helm", "help"] \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..42a162c --- /dev/null +++ b/README.md @@ -0,0 +1,8 @@ +# Kubernetes Helm + +[![](https://images.microbadger.com/badges/image/mdeterman/k8-helm:v2.11.0-rc.3.svg)](https://microbadger.com/images/mdeterman/k8-helm:v2.11.0-rc.3 "Get your own image badge on microbadger.com") +[![](https://images.microbadger.com/badges/version/mdeterman/k8-helm:v2.11.0-rc.3.svg)](https://microbadger.com/images/mdeterman/k8-helm:v2.11.0-rc.3 "Get your own version badge on microbadger.com") + +## Overview +This container provides the Helm client for use with Kubernetes + -- GitLab From a714760d681e7a0de3c3b36d8e97ebca2ce97a1d Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 18 Sep 2018 19:45:12 -0500 Subject: [PATCH 4/5] change from image --- Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44a8be8..fcbde61 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apk add --update ca-certificates \ && wget https://storage.googleapis.com/kubernetes-helm/helm-${HELM_VERSION}-linux-amd64.tar.gz \ && tar -xvf helm-${HELM_VERSION}-linux-amd64.tar.gz -FROM alpine:3.8 +FROM mdeterman/k8-kubectl:v1.11.3 LABEL maintainer="Mark Determan" @@ -24,6 +24,4 @@ LABEL org.label-schema.vcs-ref=$REF_SLUG \ org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" -COPY --from=builder /root/linux-amd64/helm /usr/local/bin - -CMD ["helm", "help"] \ No newline at end of file +COPY --from=builder /root/linux-amd64/helm /usr/local/bin \ No newline at end of file -- GitLab From 96084db06ab10f5c70e768a9dd76471b9b814fdd Mon Sep 17 00:00:00 2001 From: Mark Determan Date: Tue, 18 Sep 2018 19:46:58 -0500 Subject: [PATCH 5/5] fix for master --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f749967..0a29028 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,8 @@ image: docker:latest +variables: + VERSION: v2.11.0-rc.3 + services: - docker:dind @@ -11,7 +14,7 @@ build-master: script: - | docker build \ - --build-arg REF_NAME=$CI_COMMIT_REF_NAME \ + --build-arg REF_NAME=$VERSION \ --build-arg VCS_REF=$CI_COMMIT_REF_SLUG \ --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ -t $CI_REGISTRY_IMAGE . -- GitLab