Skip to content

Commit 3119c3f

Browse files
author
Jamie Curnow
committed
Fix CI
1 parent 9fbfb16 commit 3119c3f

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Jenkinsfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ pipeline {
66
agent any
77
environment {
88
IMAGE_NAME = "nginx-proxy-manager"
9+
BASE_IMAGE_NAME = "jc21/nginx-proxy-manager-base"
910
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
1011
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
1112
//TAG_VERSION = getPackageVersion()
@@ -23,10 +24,10 @@ pipeline {
2324
steps {
2425
ansiColor('xterm') {
2526
// Codebase
26-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install'
27-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest npm runscript build'
27+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:latest yarn --registry=$NPM_REGISTRY install'
28+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:latest npm runscript build'
2829
sh 'rm -rf node_modules'
29-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:latest yarn --registry=$NPM_REGISTRY install --prod'
30+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:latest yarn --registry=$NPM_REGISTRY install --prod'
3031
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
3132

3233
// Docker Build
@@ -55,10 +56,10 @@ pipeline {
5556
steps {
5657
ansiColor('xterm') {
5758
// Codebase
58-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
59-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf npm runscript build'
59+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:armhf yarn --registry=$NPM_REGISTRY install'
60+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:armhf npm runscript build'
6061
sh 'rm -rf node_modules'
61-
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
62+
sh 'docker run --rm -v $(pwd):/srv/app -w /srv/app $BASE_IMAGE_NAME:armhf yarn --registry=$NPM_REGISTRY install --prod'
6263

6364
// Docker Build
6465
sh 'docker build --pull --no-cache --squash --compress -t TEMP_IMAGE_NAME_ARM .'

0 commit comments

Comments
 (0)