From 7927ac0a5de8425f85797a8e000cc8d1e86cd51b Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Sun, 25 Nov 2018 18:52:18 +0200 Subject: [PATCH 1/3] Push container image to Quay --- .travis.yml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index accc3a7f..cc75436b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,19 +21,18 @@ script: after_success: - if [ -z "$DOCKER_USER" ]; then - echo "PR build, skipping Docker Hub push"; + echo "PR build, skipping image push"; else - docker tag stefanprodan/flagger:latest stefanprodan/flagger:${TRAVIS_COMMIT}; - echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin; - docker push stefanprodan/flagger:${TRAVIS_COMMIT}; + docker tag stefanprodan/flagger:latest quay.io/stefanprodan/flagger:${TRAVIS_COMMIT}; + echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin quay.io; + docker push quay.io/stefanprodan/flagger:${TRAVIS_COMMIT}; fi - if [ -z "$TRAVIS_TAG" ]; then - echo "Not a release, skipping Docker Hub push"; + echo "Not a release, skipping image push"; else - docker tag stefanprodan/flagger:latest stefanprodan/flagger:$TRAVIS_TAG; - echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin; - docker push stefanprodan/flagger:latest; - docker push stefanprodan/flagger:$TRAVIS_TAG; + docker tag stefanprodan/flagger:latest quay.io/stefanprodan/flagger:${TRAVIS_TAG}; + echo $DOCKER_PASS | docker login -u=$DOCKER_USER --password-stdin quay.io; + docker push quay.io/stefanprodan/flagger:$TRAVIS_TAG; fi - bash <(curl -s https://codecov.io/bash) - rm coverage.txt From 9159855df2a3a9d569e85830f15c05d173c13876 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 25 Nov 2018 19:20:29 +0200 Subject: [PATCH 2/3] Use Quay as container registry in Helm and YAML manifests --- Makefile | 6 +++--- artifacts/flagger/deployment.yaml | 2 +- charts/flagger/values.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 437024f3..7ba1d092 100644 --- a/Makefile +++ b/Makefile @@ -56,10 +56,10 @@ version-up: dev-up: version-up @echo "Starting build/push/deploy pipeline for $(VERSION)" - docker build -t stefanprodan/flagger:$(VERSION) . -f Dockerfile - docker push stefanprodan/flagger:$(VERSION) + docker build -t quay.io/stefanprodan/flagger:$(VERSION) . -f Dockerfile + docker push quay.io/stefanprodan/flagger:$(VERSION) kubectl apply -f ./artifacts/flagger/crd.yaml - helm upgrade --install flagger ./charts/flagger --namespace=istio-system --set crd.create=false + helm upgrade -i flagger ./charts/flagger --namespace=istio-system --set crd.create=false release: git tag $(VERSION) diff --git a/artifacts/flagger/deployment.yaml b/artifacts/flagger/deployment.yaml index f22c8b49..d7710db9 100644 --- a/artifacts/flagger/deployment.yaml +++ b/artifacts/flagger/deployment.yaml @@ -22,7 +22,7 @@ spec: serviceAccountName: flagger containers: - name: flagger - image: stefanprodan/flagger:0.1.0-beta.9 + image: quay.io/stefanprodan/flagger:0.1.0-beta.9 imagePullPolicy: Always ports: - name: http diff --git a/charts/flagger/values.yaml b/charts/flagger/values.yaml index baca1868..467e1844 100644 --- a/charts/flagger/values.yaml +++ b/charts/flagger/values.yaml @@ -1,7 +1,7 @@ # Default values for flagger. image: - repository: stefanprodan/flagger + repository: quay.io/stefanprodan/flagger tag: 0.1.0-beta.9 pullPolicy: IfNotPresent From 1022c3438a60ba845624f4acc4b4a30fb304db45 Mon Sep 17 00:00:00 2001 From: stefanprodan Date: Sun, 25 Nov 2018 19:21:42 +0200 Subject: [PATCH 3/3] Use go 1.11 for docker build --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b33e1bc4..d01737a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.10 +FROM golang:1.11 RUN mkdir -p /go/src/github.com/stefanprodan/flagger/