Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

Use docker registry repo instead of org #78

Open
wants to merge 2 commits into
base: 2.2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions packs/D/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ pipeline {
label "jenkins-dlang"
}
environment {
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
DOCKER_REGISTRY_ORG = 'REPLACE_ME_DOCKER_REGISTRY_ORG'
}
stages {
stage('CI Build and push snapshot') {
Expand All @@ -23,7 +24,7 @@ pipeline {

sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'
sh "jx step validate --min-jx-version 1.2.36"
sh "jx step post build --image \$JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST:\$JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT/$ORG/$APP_NAME:$PREVIEW_VERSION"
sh "jx step post build --image \$JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST:\$JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION"
}

dir ('./charts/preview') {
Expand Down Expand Up @@ -58,7 +59,7 @@ pipeline {

sh 'export VERSION=`cat VERSION` && skaffold build -f skaffold.yaml'
sh "jx step validate --min-jx-version 1.2.36"
sh "jx step post build --image \$JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST:\$JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT/$ORG/$APP_NAME:\$(cat VERSION)"
sh "jx step post build --image \$JENKINS_X_DOCKER_REGISTRY_SERVICE_HOST:\$JENKINS_X_DOCKER_REGISTRY_SERVICE_PORT/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packs/D/charts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packs/D/preview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packs/D/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- imageName: changeme
workspace: .
Expand All @@ -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: {}
Expand All @@ -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: "{{.TAG}}"
11 changes: 6 additions & 5 deletions packs/appserver/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ pipeline {
label "jenkins-maven"
}
environment {
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
DOCKER_REGISTRY_ORG = 'REPLACE_ME_DOCKER_REGISTRY_ORG'
}
stages {
stage('CI Build and push snapshot') {
Expand All @@ -24,7 +25,7 @@ pipeline {
sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'


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"
}

dir ('./charts/preview') {
Expand Down Expand Up @@ -60,7 +61,7 @@ pipeline {

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)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packs/appserver/charts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packs/appserver/preview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packs/appserver/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- imageName: changeme
workspace: .
Expand All @@ -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: {}
Expand All @@ -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}}"
15 changes: 8 additions & 7 deletions packs/csharp/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ pipeline {
label "jenkins-jx-base"
}
environment {
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
DOCKER_REGISTRY_ORG = 'REPLACE_ME_DOCKER_REGISTRY_ORG'
}
stages {
stage('CI Build and push snapshot') {
Expand All @@ -19,8 +20,8 @@ pipeline {
}
steps {
container('jx-base') {
sh "docker build -t $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION ."
sh "docker push $DOCKER_REGISTRY/$ORG/$APP_NAME:$PREVIEW_VERSION"
sh "docker build -t $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION ."
sh "docker push $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:$PREVIEW_VERSION"
}

dir ('./charts/preview') {
Expand Down Expand Up @@ -51,8 +52,8 @@ pipeline {
}
}
container('jx-base') {
sh "docker build -t $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION) ."
sh "docker push $DOCKER_REGISTRY/$ORG/$APP_NAME:\$(cat VERSION)"
sh "docker build -t $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION) ."
sh "docker push $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/$APP_NAME:\$(cat VERSION)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packs/csharp/charts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packs/csharp/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- imageName: changeme
workspace: .
Expand All @@ -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: {}
Expand All @@ -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}}"
13 changes: 7 additions & 6 deletions packs/go/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ pipeline {
label "jenkins-go"
}
environment {
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
GIT_PROVIDER = 'REPLACE_ME_GIT_PROVIDER'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
GIT_PROVIDER = 'REPLACE_ME_GIT_PROVIDER'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
DOCKER_REGISTRY_ORG = 'REPLACE_ME_DOCKER_REGISTRY_ORG'
}
stages {
stage('CI Build and push snapshot') {
Expand All @@ -26,7 +27,7 @@ pipeline {
sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'


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"
}
}
dir ('/home/jenkins/go/src/REPLACE_ME_GIT_PROVIDER/REPLACE_ME_ORG/REPLACE_ME_APP_NAME/charts/preview') {
Expand Down Expand Up @@ -66,7 +67,7 @@ pipeline {
sh "make build"
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)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packs/go/charts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packs/go/preview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packs/go/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- imageName: changeme
workspace: .
Expand All @@ -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: {}
Expand All @@ -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}}"
11 changes: 6 additions & 5 deletions packs/gradle/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ pipeline {
label "jenkins-gradle"
}
environment {
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
ORG = 'REPLACE_ME_ORG'
APP_NAME = 'REPLACE_ME_APP_NAME'
CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum')
DOCKER_REGISTRY_ORG = 'REPLACE_ME_DOCKER_REGISTRY_ORG'
}
stages {
stage('CI Build and push snapshot') {
Expand All @@ -24,7 +25,7 @@ pipeline {
sh "gradle clean build"
sh 'export VERSION=$PREVIEW_VERSION && skaffold build -f skaffold.yaml'

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"
}

dir ('./charts/preview') {
Expand Down Expand Up @@ -61,7 +62,7 @@ pipeline {

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)"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion packs/gradle/charts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packs/gradle/preview/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions packs/gradle/skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- imageName: changeme
workspace: .
Expand All @@ -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: {}
Expand All @@ -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}}"
Loading