From baccc745d8dabe936d5f9e26c1147b7593c9a123 Mon Sep 17 00:00:00 2001 From: Abdallah Moussawi Date: Tue, 7 May 2019 17:07:42 +0300 Subject: [PATCH 1/2] fix: use REPLACE_ME_DOCKER_REGISTRY_ORG instead of REPLACE_ME_ORG for docker regsitry organization --- packs/C++/charts/Makefile | 2 +- packs/C++/preview/Makefile | 2 +- packs/C++/skaffold.yaml | 6 +++--- packs/D/charts/Makefile | 2 +- packs/D/preview/Makefile | 2 +- packs/D/skaffold.yaml | 6 +++--- packs/appserver/charts/Makefile | 2 +- packs/appserver/preview/Makefile | 2 +- packs/appserver/skaffold.yaml | 6 +++--- packs/csharp/charts/Makefile | 2 +- packs/csharp/skaffold.yaml | 6 +++--- packs/cwp/charts/Makefile | 2 +- packs/cwp/preview/Makefile | 2 +- packs/cwp/skaffold.yaml | 6 +++--- packs/docker-helm/skaffold.yaml | 6 +++--- packs/docker/skaffold.yaml | 6 +++--- packs/dropwizard/charts/Makefile | 2 +- packs/dropwizard/preview/Makefile | 2 +- packs/dropwizard/skaffold.yaml | 6 +++--- packs/go-mongodb/charts/Makefile | 2 +- packs/go-mongodb/preview/Makefile | 2 +- packs/go-mongodb/skaffold.yaml | 6 +++--- packs/go/charts/Makefile | 2 +- packs/go/preview/Makefile | 2 +- packs/go/skaffold.yaml | 6 +++--- packs/gradle/charts/Makefile | 2 +- packs/gradle/preview/Makefile | 2 +- packs/gradle/skaffold.yaml | 6 +++--- packs/javascript/charts/Makefile | 2 +- packs/javascript/preview/Makefile | 2 +- packs/javascript/skaffold.yaml | 6 +++--- packs/jenkins/skaffold.yaml | 6 +++--- packs/liberty/charts/Makefile | 2 +- packs/liberty/preview/Makefile | 2 +- packs/liberty/skaffold.yaml | 6 +++--- packs/maven-java11/charts/Makefile | 2 +- packs/maven-java11/preview/Makefile | 2 +- packs/maven-java11/skaffold.yaml | 6 +++--- packs/maven/charts/Makefile | 2 +- packs/maven/preview/Makefile | 2 +- packs/maven/skaffold.yaml | 6 +++--- packs/php/preview/Makefile | 2 +- packs/php/skaffold.yaml | 6 +++--- packs/python/charts/Makefile | 2 +- packs/python/preview/Makefile | 2 +- packs/python/skaffold.yaml | 6 +++--- packs/ruby/preview/Makefile | 2 +- packs/ruby/skaffold.yaml | 6 +++--- packs/rust/charts/Makefile | 2 +- packs/rust/preview/Makefile | 2 +- packs/rust/skaffold.yaml | 6 +++--- packs/scala/charts/Makefile | 2 +- packs/scala/preview/Makefile | 2 +- packs/scala/skaffold.yaml | 6 +++--- packs/swift/skaffold.yaml | 6 +++--- packs/typescript/charts/Makefile | 2 +- packs/typescript/preview/Makefile | 2 +- packs/typescript/skaffold.yaml | 6 +++--- 58 files changed, 104 insertions(+), 104 deletions(-) diff --git a/packs/C++/charts/Makefile b/packs/C++/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/C++/charts/Makefile +++ b/packs/C++/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/C++/preview/Makefile b/packs/C++/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/C++/preview/Makefile +++ b/packs/C++/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/C++/skaffold.yaml b/packs/C++/skaffold.yaml index d00b1fbb3..56cb3acab 100644 --- a/packs/C++/skaffold.yaml +++ b/packs/C++/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.TAG}}' diff --git a/packs/D/charts/Makefile b/packs/D/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/D/charts/Makefile +++ b/packs/D/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/D/preview/Makefile b/packs/D/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/D/preview/Makefile +++ b/packs/D/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/D/skaffold.yaml b/packs/D/skaffold.yaml index d00b1fbb3..56cb3acab 100644 --- a/packs/D/skaffold.yaml +++ b/packs/D/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.TAG}}' diff --git a/packs/appserver/charts/Makefile b/packs/appserver/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/appserver/charts/Makefile +++ b/packs/appserver/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/appserver/preview/Makefile b/packs/appserver/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/appserver/preview/Makefile +++ b/packs/appserver/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/appserver/skaffold.yaml b/packs/appserver/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/appserver/skaffold.yaml +++ b/packs/appserver/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/csharp/charts/Makefile b/packs/csharp/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/csharp/charts/Makefile +++ b/packs/csharp/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/csharp/skaffold.yaml b/packs/csharp/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/csharp/skaffold.yaml +++ b/packs/csharp/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/cwp/charts/Makefile b/packs/cwp/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/cwp/charts/Makefile +++ b/packs/cwp/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/cwp/preview/Makefile b/packs/cwp/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/cwp/preview/Makefile +++ b/packs/cwp/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/cwp/skaffold.yaml b/packs/cwp/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/cwp/skaffold.yaml +++ b/packs/cwp/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/docker-helm/skaffold.yaml b/packs/docker-helm/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/docker-helm/skaffold.yaml +++ b/packs/docker-helm/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/docker/skaffold.yaml b/packs/docker/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/docker/skaffold.yaml +++ b/packs/docker/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/dropwizard/charts/Makefile b/packs/dropwizard/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/dropwizard/charts/Makefile +++ b/packs/dropwizard/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/dropwizard/preview/Makefile b/packs/dropwizard/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/dropwizard/preview/Makefile +++ b/packs/dropwizard/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/dropwizard/skaffold.yaml b/packs/dropwizard/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/dropwizard/skaffold.yaml +++ b/packs/dropwizard/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/go-mongodb/charts/Makefile b/packs/go-mongodb/charts/Makefile index aec890148..c9a208f23 100644 --- a/packs/go-mongodb/charts/Makefile +++ b/packs/go-mongodb/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/$(NAME)|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/$(NAME)|" values.yaml sed -i -e "s/tag:.*/tag: $(VERSION)/" values.yaml else echo "platfrom $(OS) not supported to tag with" diff --git a/packs/go-mongodb/preview/Makefile b/packs/go-mongodb/preview/Makefile index a5510e7bb..b63aa47a4 100755 --- a/packs/go-mongodb/preview/Makefile +++ b/packs/go-mongodb/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/go-mongodb/skaffold.yaml b/packs/go-mongodb/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/go-mongodb/skaffold.yaml +++ b/packs/go-mongodb/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/go/charts/Makefile b/packs/go/charts/Makefile index aec890148..c9a208f23 100644 --- a/packs/go/charts/Makefile +++ b/packs/go/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/$(NAME)|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/$(NAME)|" values.yaml sed -i -e "s/tag:.*/tag: $(VERSION)/" values.yaml else echo "platfrom $(OS) not supported to tag with" diff --git a/packs/go/preview/Makefile b/packs/go/preview/Makefile index a5510e7bb..b63aa47a4 100755 --- a/packs/go/preview/Makefile +++ b/packs/go/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/go/skaffold.yaml b/packs/go/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/go/skaffold.yaml +++ b/packs/go/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/gradle/charts/Makefile b/packs/gradle/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/gradle/charts/Makefile +++ b/packs/gradle/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/gradle/preview/Makefile b/packs/gradle/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/gradle/preview/Makefile +++ b/packs/gradle/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/gradle/skaffold.yaml b/packs/gradle/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/gradle/skaffold.yaml +++ b/packs/gradle/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/javascript/charts/Makefile b/packs/javascript/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/javascript/charts/Makefile +++ b/packs/javascript/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/javascript/preview/Makefile b/packs/javascript/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/javascript/preview/Makefile +++ b/packs/javascript/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/javascript/skaffold.yaml b/packs/javascript/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/javascript/skaffold.yaml +++ b/packs/javascript/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/jenkins/skaffold.yaml b/packs/jenkins/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/jenkins/skaffold.yaml +++ b/packs/jenkins/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/liberty/charts/Makefile b/packs/liberty/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/liberty/charts/Makefile +++ b/packs/liberty/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/liberty/preview/Makefile b/packs/liberty/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/liberty/preview/Makefile +++ b/packs/liberty/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/liberty/skaffold.yaml b/packs/liberty/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/liberty/skaffold.yaml +++ b/packs/liberty/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/maven-java11/charts/Makefile b/packs/maven-java11/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/maven-java11/charts/Makefile +++ b/packs/maven-java11/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/maven-java11/preview/Makefile b/packs/maven-java11/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/maven-java11/preview/Makefile +++ b/packs/maven-java11/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/maven-java11/skaffold.yaml b/packs/maven-java11/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/maven-java11/skaffold.yaml +++ b/packs/maven-java11/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/maven/charts/Makefile b/packs/maven/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/maven/charts/Makefile +++ b/packs/maven/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/maven/preview/Makefile b/packs/maven/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/maven/preview/Makefile +++ b/packs/maven/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/maven/skaffold.yaml b/packs/maven/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/maven/skaffold.yaml +++ b/packs/maven/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/php/preview/Makefile b/packs/php/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/php/preview/Makefile +++ b/packs/php/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/php/skaffold.yaml b/packs/php/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/php/skaffold.yaml +++ b/packs/php/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/python/charts/Makefile b/packs/python/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/python/charts/Makefile +++ b/packs/python/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/python/preview/Makefile b/packs/python/preview/Makefile index a5510e7bb..b63aa47a4 100755 --- a/packs/python/preview/Makefile +++ b/packs/python/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/python/skaffold.yaml b/packs/python/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/python/skaffold.yaml +++ b/packs/python/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/ruby/preview/Makefile b/packs/ruby/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/ruby/preview/Makefile +++ b/packs/ruby/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/ruby/skaffold.yaml b/packs/ruby/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/ruby/skaffold.yaml +++ b/packs/ruby/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/rust/charts/Makefile b/packs/rust/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/rust/charts/Makefile +++ b/packs/rust/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/rust/preview/Makefile b/packs/rust/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/rust/preview/Makefile +++ b/packs/rust/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/rust/skaffold.yaml b/packs/rust/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/rust/skaffold.yaml +++ b/packs/rust/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/scala/charts/Makefile b/packs/scala/charts/Makefile index a4f1480fc..35409cb8b 100644 --- a/packs/scala/charts/Makefile +++ b/packs/scala/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s/repository:.*/repository: $(JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST):$(JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME/" values.yaml + sed -i -e "s/repository:.*/repository: $(JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST):$(JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME/" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/scala/preview/Makefile b/packs/scala/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/scala/preview/Makefile +++ b/packs/scala/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/scala/skaffold.yaml b/packs/scala/skaffold.yaml index e047d03fa..a835a6899 100644 --- a/packs/scala/skaffold.yaml +++ b/packs/scala/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST}}:{{.JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/swift/skaffold.yaml b/packs/swift/skaffold.yaml index f553b294f..4785e6706 100644 --- a/packs/swift/skaffold.yaml +++ b/packs/swift/skaffold.yaml @@ -7,7 +7,7 @@ build: docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}' local: {} deploy: kubectl: {} @@ -18,7 +18,7 @@ profiles: - docker: {} tagPolicy: envTemplate: - template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' + template: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}' local: {} deploy: helm: @@ -26,5 +26,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME' + image.repository: '{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME' image.tag: '{{.DIGEST_HEX}}' diff --git a/packs/typescript/charts/Makefile b/packs/typescript/charts/Makefile index 55669f078..88639f8f3 100644 --- a/packs/typescript/charts/Makefile +++ b/packs/typescript/charts/Makefile @@ -36,7 +36,7 @@ ifeq ($(OS),Darwin) sed -i "" -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(RELEASE_VERSION)/" Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(RELEASE_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/typescript/preview/Makefile b/packs/typescript/preview/Makefile index ef73f4fcf..dc2c852a6 100755 --- a/packs/typescript/preview/Makefile +++ b/packs/typescript/preview/Makefile @@ -8,7 +8,7 @@ ifeq ($(OS),Darwin) else ifeq ($(OS),Linux) sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" Chart.yaml sed -i -e "s/version:.*/version: $(PREVIEW_VERSION)/" ../*/Chart.yaml - sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_ORG\/REPLACE_ME_APP_NAME|" values.yaml + sed -i -e "s|repository:.*|repository: $(DOCKER_REGISTRY)\/REPLACE_ME_DOCKER_REGISTRY_ORG\/REPLACE_ME_APP_NAME|" values.yaml sed -i -e "s/tag:.*/tag: $(PREVIEW_VERSION)/" values.yaml else echo "platfrom $(OS) not supported to release from" diff --git a/packs/typescript/skaffold.yaml b/packs/typescript/skaffold.yaml index 70104e1cf..0f9b6ec9e 100644 --- a/packs/typescript/skaffold.yaml +++ b/packs/typescript/skaffold.yaml @@ -3,7 +3,7 @@ kind: Config build: tagPolicy: envTemplate: - template: "{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}" + template: "{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.VERSION}}" artifacts: - image: changeme context: . @@ -17,7 +17,7 @@ profiles: build: tagPolicy: envTemplate: - template: "{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}" + template: "{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME:{{.DIGEST_HEX}}" artifacts: - docker: {} local: {} @@ -27,5 +27,5 @@ profiles: - name: REPLACE_ME_APP_NAME chartPath: charts/REPLACE_ME_APP_NAME setValueTemplates: - image.repository: "{{.DOCKER_REGISTRY}}/REPLACE_ME_ORG/REPLACE_ME_APP_NAME" + image.repository: "{{.DOCKER_REGISTRY}}/REPLACE_ME_DOCKER_REGISTRY_ORG/REPLACE_ME_APP_NAME" image.tag: "{{.DIGEST_HEX}}" From 0b3a46da42a0bc35420f157d90434927fb8ece23 Mon Sep 17 00:00:00 2001 From: Abdallah Moussawi Date: Tue, 7 May 2019 21:53:37 +0300 Subject: [PATCH 2/2] fix: use DOCKER_REGISTRY_ORG env instead of ORG to hold the docker registry org in build pipelines --- packs/C++/pipeline.yaml | 4 ++-- packs/D/pipeline.yaml | 4 ++-- packs/csharp/pipeline.yaml | 4 ++-- packs/cwp/pipeline.yaml | 4 ++-- packs/go-mongodb/pipeline.yaml | 4 ++-- packs/go/pipeline.yaml | 4 ++-- packs/gradle/pipeline.yaml | 4 ++-- packs/javascript/pipeline.yaml | 4 ++-- packs/maven/pipeline.yaml | 4 ++-- packs/php/pipeline.yaml | 4 ++-- packs/python/pipeline.yaml | 4 ++-- packs/ruby/pipeline.yaml | 4 ++-- packs/rust/pipeline.yaml | 4 ++-- packs/scala/pipeline.yaml | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packs/C++/pipeline.yaml b/packs/C++/pipeline.yaml index afb9372c1..dc9c8d449 100644 --- a/packs/C++/pipeline.yaml +++ b/packs/C++/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/D/pipeline.yaml b/packs/D/pipeline.yaml index b6ec611dc..49d72a54c 100644 --- a/packs/D/pipeline.yaml +++ b/packs/D/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/csharp/pipeline.yaml b/packs/csharp/pipeline.yaml index 8d47f80b3..6a10ebe73 100644 --- a/packs/csharp/pipeline.yaml +++ b/packs/csharp/pipeline.yaml @@ -12,7 +12,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -32,7 +32,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/cwp/pipeline.yaml b/packs/cwp/pipeline.yaml index 09d6cfad7..b6c1653ce 100644 --- a/packs/cwp/pipeline.yaml +++ b/packs/cwp/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION promote: steps: - dir: charts/preview @@ -22,7 +22,7 @@ pipelines: steps: - sh: skaffold version - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) promote: steps: - dir: charts/REPLACE_ME_APP_NAME diff --git a/packs/go-mongodb/pipeline.yaml b/packs/go-mongodb/pipeline.yaml index 83f8cca2e..c29425231 100644 --- a/packs/go-mongodb/pipeline.yaml +++ b/packs/go-mongodb/pipeline.yaml @@ -8,7 +8,7 @@ pipelines: - sh: export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION promote: steps: - dir: /home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME/charts/preview @@ -20,7 +20,7 @@ pipelines: build: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) promote: steps: - dir: /home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME/charts/REPLACE_ME_APP_NAME diff --git a/packs/go/pipeline.yaml b/packs/go/pipeline.yaml index d7887609a..856ed0339 100644 --- a/packs/go/pipeline.yaml +++ b/packs/go/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/gradle/pipeline.yaml b/packs/gradle/pipeline.yaml index 71f68dcf8..d978cbfd1 100644 --- a/packs/gradle/pipeline.yaml +++ b/packs/gradle/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/javascript/pipeline.yaml b/packs/javascript/pipeline.yaml index adcf4e001..9bfa4088b 100644 --- a/packs/javascript/pipeline.yaml +++ b/packs/javascript/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/maven/pipeline.yaml b/packs/maven/pipeline.yaml index f881ef2b8..0c7ec77cc 100644 --- a/packs/maven/pipeline.yaml +++ b/packs/maven/pipeline.yaml @@ -11,7 +11,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -29,7 +29,7 @@ pipelines: name: skaffold-version - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/php/pipeline.yaml b/packs/php/pipeline.yaml index 8d47f80b3..6a10ebe73 100644 --- a/packs/php/pipeline.yaml +++ b/packs/php/pipeline.yaml @@ -12,7 +12,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -32,7 +32,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/python/pipeline.yaml b/packs/python/pipeline.yaml index 68d880057..e5386619f 100644 --- a/packs/python/pipeline.yaml +++ b/packs/python/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/ruby/pipeline.yaml b/packs/ruby/pipeline.yaml index 72e1f15e3..ada34c578 100644 --- a/packs/ruby/pipeline.yaml +++ b/packs/ruby/pipeline.yaml @@ -12,7 +12,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -32,7 +32,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/rust/pipeline.yaml b/packs/rust/pipeline.yaml index cab0544d6..a92e8c3ca 100644 --- a/packs/rust/pipeline.yaml +++ b/packs/rust/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: diff --git a/packs/scala/pipeline.yaml b/packs/scala/pipeline.yaml index c19458f6b..564b287be 100644 --- a/packs/scala/pipeline.yaml +++ b/packs/scala/pipeline.yaml @@ -9,7 +9,7 @@ pipelines: name: container-build postBuild: steps: - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION name: post-build promote: steps: @@ -25,7 +25,7 @@ pipelines: steps: - sh: export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml name: container-build - - sh: jx step post build --image $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) + - sh: jx step post build --image $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) name: post-build promote: steps: