Skip to content

Commit 4f60d3e

Browse files
jc21jc21
committed
Fix CI now that tags are changes
1 parent 7d86fd2 commit 4f60d3e

File tree

1 file changed

+67
-67
lines changed

1 file changed

+67
-67
lines changed

‎Jenkinsfile

+67-67
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ pipeline {
55
}
66
agent any
77
environment {
8-
IMAGE_NAME = "nginx-proxy-manager"
9-
BASE_IMAGE_NAME = "jc21/nginx-proxy-manager-base:latest"
10-
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
11-
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
12-
TEMP_IMAGE_NAME_ARM64 = "nginx-proxy-manager-arm64-build_${BUILD_NUMBER}"
13-
TAG_VERSION = getPackageVersion()
14-
MAJOR_VERSION = "2"
8+
IMAGE = "nginx-proxy-manager"
9+
BASE_IMAGE = "jc21/nginx-proxy-manager-base"
10+
TEMP_IMAGE = "nginx-proxy-manager-build_${BUILD_NUMBER}"
11+
TEMP_IMAGE_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
12+
TEMP_IMAGE_ARM64 = "nginx-proxy-manager-arm64-build_${BUILD_NUMBER}"
13+
TAG_VERSION = getPackageVersion()
14+
MAJOR_VERSION = "2"
1515
}
1616
stages {
1717
stage('Prepare') {
@@ -26,30 +26,30 @@ pipeline {
2626
steps {
2727
ansiColor('xterm') {
2828
// Codebase
29-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn install'
30-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME npm run-script build'
29+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install'
30+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE npm run-script build'
3131
sh 'rm -rf node_modules'
32-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn install --prod'
32+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install --prod'
3333
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
3434

3535
// Docker Build
36-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
36+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE .'
3737

3838
// Dockerhub
39-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:develop'
39+
sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:develop'
4040
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
4141
sh "docker login -u '${duser}' -p '$dpass'"
42-
sh 'docker push docker.io/jc21/$IMAGE_NAME:develop'
42+
sh 'docker push docker.io/jc21/$IMAGE:develop'
4343
}
4444

4545
// Private Registry
46-
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:develop'
46+
sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:develop'
4747
withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
4848
sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
49-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:develop'
49+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:develop'
5050
}
5151

52-
sh 'docker rmi $TEMP_IMAGE_NAME'
52+
sh 'docker rmi $TEMP_IMAGE'
5353
}
5454
}
5555
}
@@ -62,40 +62,40 @@ pipeline {
6262
steps {
6363
ansiColor('xterm') {
6464
// Codebase
65-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn install'
66-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME npm run-script build'
65+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install'
66+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE npm run-script build'
6767
sh 'rm -rf node_modules'
68-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn install --prod'
68+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE yarn install --prod'
6969
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
7070

7171
// Docker Build
72-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
72+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE .'
7373

7474
// Dockerhub
75-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
76-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION'
77-
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
75+
sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:$TAG_VERSION'
76+
sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:$MAJOR_VERSION'
77+
sh 'docker tag $TEMP_IMAGE docker.io/jc21/$IMAGE:latest'
7878

7979
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
8080
sh "docker login -u '${duser}' -p '$dpass'"
81-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
82-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION'
83-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
81+
sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION'
82+
sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION'
83+
sh 'docker push docker.io/jc21/$IMAGE:latest'
8484
}
8585

8686
// Private Registry
87-
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
88-
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION'
89-
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
87+
sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION'
88+
sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION'
89+
sh 'docker tag $TEMP_IMAGE $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest'
9090

9191
withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
9292
sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
93-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
94-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION'
95-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
93+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION'
94+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION'
95+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest'
9696
}
9797

98-
sh 'docker rmi $TEMP_IMAGE_NAME'
98+
sh 'docker rmi $TEMP_IMAGE'
9999
}
100100
}
101101
}
@@ -109,39 +109,39 @@ pipeline {
109109
steps {
110110
ansiColor('xterm') {
111111
// Codebase
112-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf yarn install'
113-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf npm run-script build'
112+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf yarn install'
113+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf npm run-script build'
114114
sh 'rm -rf node_modules'
115-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf yarn install --prod'
115+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:armhf yarn install --prod'
116116

117117
// Docker Build
118-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM -f Dockerfile.armhf .'
118+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_ARM -f Dockerfile.armhf .'
119119

120120
// Dockerhub
121-
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
122-
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-armhf'
123-
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
121+
sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:$TAG_VERSION-armhf'
122+
sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:$MAJOR_VERSION-armhf'
123+
sh 'docker tag $TEMP_IMAGE_ARM docker.io/jc21/$IMAGE:latest-armhf'
124124

125125
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
126126
sh "docker login -u '${duser}' -p '$dpass'"
127-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
128-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-armhf'
129-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
127+
sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION-armhf'
128+
sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION-armhf'
129+
sh 'docker push docker.io/jc21/$IMAGE:latest-armhf'
130130
}
131131

132132
// Private Registry
133-
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
134-
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-armhf'
135-
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
133+
sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-armhf'
134+
sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-armhf'
135+
sh 'docker tag $TEMP_IMAGE_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-armhf'
136136

137137
withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
138138
sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
139-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
140-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-armhf'
141-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
139+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-armhf'
140+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-armhf'
141+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-armhf'
142142
}
143143

144-
sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
144+
sh 'docker rmi $TEMP_IMAGE_ARM'
145145
}
146146
}
147147
}
@@ -155,39 +155,39 @@ pipeline {
155155
steps {
156156
ansiColor('xterm') {
157157
// Codebase
158-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-arm64 yarn install'
159-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-arm64 npm run-script build'
158+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 yarn install'
159+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 npm run-script build'
160160
sh 'rm -rf node_modules'
161-
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-arm64 yarn install --prod'
161+
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE:arm64 yarn install --prod'
162162

163163
// Docker Build
164-
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM64 -f Dockerfile.arm64 .'
164+
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_ARM64 -f Dockerfile.arm64 .'
165165

166166
// Dockerhub
167-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-arm64'
168-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-arm64'
169-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 docker.io/jc21/$IMAGE_NAME:latest-arm64'
167+
sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:$TAG_VERSION-arm64'
168+
sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:$MAJOR_VERSION-arm64'
169+
sh 'docker tag $TEMP_IMAGE_ARM64 docker.io/jc21/$IMAGE:latest-arm64'
170170

171171
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
172172
sh "docker login -u '${duser}' -p '$dpass'"
173-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-arm64'
174-
sh 'docker push docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-arm64'
175-
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-arm64'
173+
sh 'docker push docker.io/jc21/$IMAGE:$TAG_VERSION-arm64'
174+
sh 'docker push docker.io/jc21/$IMAGE:$MAJOR_VERSION-arm64'
175+
sh 'docker push docker.io/jc21/$IMAGE:latest-arm64'
176176
}
177177

178178
// Private Registry
179-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-arm64'
180-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-arm64'
181-
sh 'docker tag $TEMP_IMAGE_NAME_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-arm64'
179+
sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-arm64'
180+
sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-arm64'
181+
sh 'docker tag $TEMP_IMAGE_ARM64 $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-arm64'
182182

183183
withCredentials([usernamePassword(credentialsId: 'jc21-private-registry', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
184184
sh "docker login -u '${duser}' -p '$dpass' $DOCKER_PRIVATE_REGISTRY"
185-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-arm64'
186-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-arm64'
187-
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-arm64'
185+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$TAG_VERSION-arm64'
186+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:$MAJOR_VERSION-arm64'
187+
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE:latest-arm64'
188188
}
189189

190-
sh 'docker rmi $TEMP_IMAGE_NAME_ARM64'
190+
sh 'docker rmi $TEMP_IMAGE_ARM64'
191191
}
192192
}
193193
}

0 commit comments

Comments
 (0)