Skip to content

Commit

Permalink
Fix docker building flow
Browse files Browse the repository at this point in the history
Mateusz Kubaczyk committed May 8, 2020

Verified

This commit was signed with the committer’s verified signature.
alexvanboxel Alex Van Boxel
1 parent ea30c38 commit 061a2ce
Showing 2 changed files with 6 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -53,9 +53,9 @@ jobs:
name: build docker images and push them to dockerhub
command: |
docker login -u $DOCKER_USER -p $DOCKER_PASS
docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.16.7 --build-arg HELM_VERSION=v2.16.7 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.16.7 --build-arg HELM_VERSION=v2.16.7 --build-arg HELM_DIFF_VERSION=master -f dockerfile/dockerfile --no-cache .
docker push praqma/helmsman:$CIRCLE_TAG-helm-v2.16.7
docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.15.2 --build-arg HELM_VERSION=v2.15.2 --build-arg HELM_DIFF_VERSION=master dockerfile/. --no-cache
docker build -t praqma/helmsman:$CIRCLE_TAG-helm-v2.15.2 --build-arg HELM_VERSION=v2.15.2 --build-arg HELM_DIFF_VERSION=master -f dockerfile/dockerfile --no-cache .
docker push praqma/helmsman:$CIRCLE_TAG-helm-v2.15.2
- run:
7 changes: 4 additions & 3 deletions dockerfile/dockerfile
Original file line number Diff line number Diff line change
@@ -6,11 +6,12 @@ FROM golang:${GO_VERSION}-alpine3.10 as builder
WORKDIR /go/src/

RUN apk --no-cache add make git dep
RUN git clone https://github.com/Praqma/helmsman.git
COPY . helmsman/

WORKDIR /go/src/helmsman

# build a statically linked binary so that it works on stripped linux images such as alpine/busybox.
RUN cd helmsman \
&& LastTag=$(git describe --abbrev=0 --tags) \
RUN LastTag=$(git describe --abbrev=0 --tags) \
&& TAG=$LastTag-$(date +"%d%m%y") \
&& LT_SHA=$(git rev-parse ${LastTag}^{}) \
&& LC_SHA=$(git rev-parse HEAD) \

0 comments on commit 061a2ce

Please sign in to comment.