Update Jenkinsfile

Update Jenkinsfile

Jenkinsfile

@@ -1,6 +1,6 @@
 pipeline {
 	agent {
-		label 'docker-multiarch'
+		label 'master'
 	}
 	options {
 		buildDiscarder(logRotator(numToKeepStr: '5'))
@@ -11,7 +11,7 @@ pipeline {
 		IMAGE                      = "nginx-proxy-manager"
 		BUILD_VERSION              = getVersion()
 		MAJOR_VERSION              = "2"
-		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
+		BRANCH_LOWER               = "proxyprotocol"
 		COMPOSE_PROJECT_NAME       = "npm_${BRANCH_LOWER}_${BUILD_NUMBER}"
 		COMPOSE_FILE               = 'docker/docker-compose.ci.yml'
 		COMPOSE_INTERACTIVE_NO_CLI = 1
@@ -20,29 +20,6 @@ pipeline {
 	stages {
 		stage('Environment') {
 			parallel {
-				stage('Master') {
-					when {
-						branch 'master'
-					}
-					steps {
-						script {
-							env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:${BUILD_VERSION} -t docker.io/jc21/${IMAGE}:${MAJOR_VERSION} -t docker.io/jc21/${IMAGE}:latest"
-						}
-					}
-				}
-				stage('Other') {
-					when {
-						not {
-							branch 'master'
-						}
-					}
-					steps {
-						script {
-							// Defaults to the Branch name, which is applies to all branches AND pr's
-							env.BUILDX_PUSH_TAGS = "-t docker.io/jc21/${IMAGE}:github-${BRANCH_LOWER}"
-						}
-					}
-				}
 				stage('Versions') {
 					steps {
 						sh 'cat frontend/package.json | jq --arg BUILD_VERSION "${BUILD_VERSION}" \'.version = $BUILD_VERSION\' | sponge frontend/package.json'
@@ -163,58 +140,8 @@ pipeline {
 				}
 			}
 			steps {
-				withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
-					// Docker Login
-					sh "docker login -u '${duser}' -p '${dpass}'"
 					// Buildx with push from cache
-					sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
+					sh "./scripts/buildx"
-				}
-			}
-		}
-		stage('Docs Deploy') {
-			when {
-				allOf {
-					branch 'master'
-					not {
-						equals expected: 'UNSTABLE', actual: currentBuild.result
-					}
-				}
-			}
-			steps {
-				withCredentials([[$class: 'AmazonWebServicesCredentialsBinding', accessKeyVariable: 'AWS_ACCESS_KEY_ID', credentialsId: 'npm-s3-docs', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY']]) {
-					sh """docker run --rm \\
-						--name \${COMPOSE_PROJECT_NAME}-docs-upload \\
-						-e S3_BUCKET=jc21-npm-site \\
-						-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \\
-						-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \\
-						-v \$(pwd):/app \\
-						-w /app \\
-						jc21/ci-tools \\
-						scripts/docs-upload /app/docs/.vuepress/dist/
-					"""
-
-					sh """docker run --rm \\
-						--name \${COMPOSE_PROJECT_NAME}-docs-invalidate \\
-						-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \\
-						-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \\
-						jc21/ci-tools \\
-						aws cloudfront create-invalidation --distribution-id EN1G6DEWZUTDT --paths '/*'
-					"""
-				}
-			}
-		}
-		stage('PR Comment') {
-			when {
-				allOf {
-					changeRequest()
-					not {
-						equals expected: 'UNSTABLE', actual: currentBuild.result
-					}
-				}
-			}
-			steps {
-				script {
-					def comment = pullRequest.comment("This is an automated message from CI:\n\nDocker Image for build ${BUILD_NUMBER} is available on [DockerHub](https://cloud.docker.com/repository/docker/jc21/${IMAGE}) as `jc21/${IMAGE}:github-${BRANCH_LOWER}`\n\n**Note:** ensure you backup your NPM instance before testing this PR image! Especially if this PR contains database changes.")
 				}
 			}
 		}
@@ -240,7 +167,6 @@ pipeline {
 			sh 'figlet "UNSTABLE"'
 		}
 	}
-}
 
 def getVersion() {
 	ver = sh(script: 'cat .version', returnStdout: true)

scripts/buildx

@@ -10,7 +10,7 @@ cd "${DIR}/.." || exit 1
 
 # determine commit if not already set
 if [ "$BUILD_COMMIT" == "" ]; then
-	BUILD_COMMIT=$(git log -n 1 --format=%h)
+        BUILD_COMMIT=$(git log -n 1 --format=%h)
 fi
 
 # Buildx Builder
@@ -18,19 +18,18 @@ docker buildx create --name "${BUILDX_NAME:-npm}" || echo
 docker buildx use "${BUILDX_NAME:-npm}"
 
 docker buildx build \
-	--build-arg BUILD_VERSION="${BUILD_VERSION:-dev}" \
+        --build-arg BUILD_VERSION="${BUILD_VERSION:-dev}" \
-	--build-arg BUILD_COMMIT="${BUILD_COMMIT:-notset}" \
+        --build-arg BUILD_COMMIT="${BUILD_COMMIT:-notset}" \
-	--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \
+        --build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \
-	--build-arg GOPROXY="${GOPROXY:-}" \
+        --build-arg GOPROXY="${GOPROXY:-}" \
-	--build-arg GOPRIVATE="${GOPRIVATE:-}" \
+        --build-arg GOPRIVATE="${GOPRIVATE:-}" \
-	--platform linux/amd64,linux/arm64,linux/arm/7 \
+        --platform linux/amd64 \
-	--progress plain \
+        --progress plain \
-	--pull \
+        --pull \
-	-f docker/Dockerfile \
+        -f docker/Dockerfile \
-	$@ \
+        --output=type=docker,dest=- . > npm.tar
-	.
 
 rc=$?
 docker buildx rm "${BUILDX_NAME:-npm}"
 echo -e "${BLUE}❯ ${GREEN}Multiarch build Complete${RESET}"
-exit $rc
+exit $rc