Version 3 starter

Author: jc21

.gitignore

@@ -1,5 +1,20 @@
-.DS_Store
 .idea
+.env
+.DS_Store
 ._*
+*.code-workspace
+vendor
+dist
+backend/config.json
+backend/internal/api/handler/assets
+test/node_modules
+*/node_modules
+docs/.vuepress/dist
+frontend/build
+frontend/yarn-error.log
+frontend/yarn.lock
+frontend/.npmrc
+test/cypress/fixtures/example.json
 .vscode
-certbot-help.txt
+docker-build
+data

.version

@@ -1 +1 @@
-2.9.3
+3.0.0a

DEV-README.md

@@ -0,0 +1,27 @@
+# Nginx Proxy Manager 3
+
+WIP
+
+
+## Usage
+
+environment variables
+
+
+## Building
+
+### Backend API Server
+
+```bash
+go build -ldflags="-X main.commit=$(git log -n 1 --format=%h)" -o bin/server ./cmd/server/main.go
+```
+
+
+## Development
+
+```bash
+git clone nginxproxymanager
+cd nginxproxymanager
+./scripts/start-dev
+curl http://127.0.0.1:3000/api/
+```

Jenkinsfile

@@ -8,14 +8,17 @@ pipeline {
 		ansiColor('xterm')
 	}
 	environment {
-		IMAGE                      = "nginx-proxy-manager"
+		IMAGE                      = 'nginx-proxy-manager'
 		BUILD_VERSION              = getVersion()
-		MAJOR_VERSION              = "2"
+		BUILD_COMMIT               = getCommit()
+		MAJOR_VERSION              = '3'
 		BRANCH_LOWER               = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}"
 		COMPOSE_PROJECT_NAME       = "npm_${BRANCH_LOWER}_${BUILD_NUMBER}"
 		COMPOSE_FILE               = 'docker/docker-compose.ci.yml'
 		COMPOSE_INTERACTIVE_NO_CLI = 1
 		BUILDX_NAME                = "${COMPOSE_PROJECT_NAME}"
+		DOCS_BUCKET                = 'jc21-npm-site-next' // TODO: change to prod when official
+		DOCS_CDN                   = 'E2Z0128EHS0Q23'     // TODO: same
 	}
 	stages {
 		stage('Environment') {
@@ -45,89 +48,67 @@ pipeline {
 				}
 				stage('Versions') {
 					steps {
+						// Is this frontend version stuff still applicable?
 						sh 'cat frontend/package.json | jq --arg BUILD_VERSION "${BUILD_VERSION}" \'.version = $BUILD_VERSION\' | sponge frontend/package.json'
 						sh 'echo -e "\\E[1;36mFrontend Version is:\\E[1;33m $(cat frontend/package.json | jq -r .version)\\E[0m"'
-						sh 'cat backend/package.json | jq --arg BUILD_VERSION "${BUILD_VERSION}" \'.version = $BUILD_VERSION\' | sponge backend/package.json'
-						sh 'echo -e "\\E[1;36mBackend Version is:\\E[1;33m  $(cat backend/package.json | jq -r .version)\\E[0m"'
 						sh 'sed -i -E "s/(version-)[0-9]+\\.[0-9]+\\.[0-9]+(-green)/\\1${BUILD_VERSION}\\2/" README.md'
 					}
 				}
 			}
 		}
 		stage('Frontend') {
 			steps {
-				sh './scripts/frontend-build'
+				sh './scripts/ci/frontend-build'
+			}
+			post {
+				always {
+					junit 'frontend/eslint.xml'
+					junit 'frontend/junit.xml'
+				}
 			}
 		}
 		stage('Backend') {
 			steps {
-				echo 'Checking Syntax ...'
-				// See: https://github.com/yarnpkg/yarn/issues/3254
-				sh '''docker run --rm \\
-					-v "$(pwd)/backend:/app" \\
-					-v "$(pwd)/global:/app/global" \\
-					-w /app \\
-					node:latest \\
-					sh -c "yarn install && yarn eslint . && rm -rf node_modules"
-				'''
-
-				echo 'Docker Build ...'
-				sh '''docker build --pull --no-cache --squash --compress \\
-					-t "${IMAGE}:ci-${BUILD_NUMBER}" \\
-					-f docker/Dockerfile \\
-					--build-arg TARGETPLATFORM=linux/amd64 \\
-					--build-arg BUILDPLATFORM=linux/amd64 \\
-					--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
-					--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
-					--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
-					.
-				'''
+				withCredentials([usernamePassword(credentialsId: 'oss-index-token', passwordVariable: 'NANCY_TOKEN', usernameVariable: 'NANCY_USER')]) {
+					sh '''docker build --pull --no-cache --squash --compress \\
+						-t ${IMAGE}:ci-${BUILD_NUMBER} \\
+						-f docker/Dockerfile \\
+						--build-arg TARGETPLATFORM=linux/amd64 \\
+						--build-arg BUILDPLATFORM=linux/amd64 \\
+						--build-arg BUILD_DATE="$(date '+%Y-%m-%d %T %Z')" \\
+						--build-arg BUILD_VERSION="${BUILD_VERSION}" \\
+						--build-arg BUILD_COMMIT="${BUILD_COMMIT}" \\
+						--build-arg SENTRY_DSN="${SENTRY_DSN:-}" \\
+						--build-arg GOPROXY="${GOPROXY:-}" \\
+						--build-arg GOPRIVATE="${GOPRIVATE:-}" \\
+						--build-arg NANCY_USER="${NANCY_USER}" \\
+						--build-arg NANCY_TOKEN="${NANCY_TOKEN}" \\
+						.
+					'''
+				}
 			}
 		}
-		stage('Integration Tests Sqlite') {
-			steps {
-				// Bring up a stack
-				sh 'docker-compose up -d fullstack-sqlite'
-				sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120'
-
-				// Run tests
-				sh 'rm -rf test/results'
-				sh 'docker-compose up cypress-sqlite'
-				// Get results
-				sh 'docker cp -L "$(docker-compose ps -q cypress-sqlite):/test/results" test/'
-			}
-			post {
-				always {
-					// Dumps to analyze later
-					sh 'mkdir -p debug'
-					sh 'docker-compose logs fullstack-sqlite | gzip > debug/docker_fullstack_sqlite.log.gz'
-					sh 'docker-compose logs db | gzip > debug/docker_db.log.gz'
-					// Cypress videos and screenshot artifacts
-					dir(path: 'test/results') {
-						archiveArtifacts allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml'
-					}
-					junit 'test/results/junit/*'
+		stage('Test') {
+			when {
+				not {
+					equals expected: 'UNSTABLE', actual: currentBuild.result
 				}
 			}
-		}
-		stage('Integration Tests Mysql') {
 			steps {
 				// Bring up a stack
-				sh 'docker-compose up -d fullstack-mysql'
-				sh './scripts/wait-healthy $(docker-compose ps -q fullstack-mysql) 120'
-
+				sh 'docker-compose up -d fullstack'
+				sh './scripts/wait-healthy $(docker-compose ps -q fullstack) 120'
 				// Run tests
 				sh 'rm -rf test/results'
-				sh 'docker-compose up cypress-mysql'
+				sh 'docker-compose up cypress'
 				// Get results
-				sh 'docker cp -L "$(docker-compose ps -q cypress-mysql):/test/results" test/'
+				sh 'docker cp -L "$(docker-compose ps -q cypress):/test/results" test/'
 			}
 			post {
 				always {
 					// Dumps to analyze later
 					sh 'mkdir -p debug'
-					sh 'docker-compose logs fullstack-mysql | gzip > debug/docker_fullstack_mysql.log.gz'
-					sh 'docker-compose logs db | gzip > debug/docker_db.log.gz'
+					sh 'docker-compose logs fullstack | gzip > debug/docker_fullstack.log.gz'
 					// Cypress videos and screenshot artifacts
 					dir(path: 'test/results') {
 						archiveArtifacts allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml'
@@ -148,28 +129,41 @@ pipeline {
 					sh 'yarn build'
 				}
 
+				// API Docs:
+				sh 'docker-compose exec -T fullstack curl -s --output /temp-docs/api-schema.json "http://fullstack:81/api/schema"'
+				sh 'mkdir -p "docs/.vuepress/dist/api"'
+				sh 'mv docs/api-schema.json docs/.vuepress/dist/api/'
+
 				dir(path: 'docs/.vuepress/dist') {
 					sh 'tar -czf ../../docs.tgz *'
 				}
 
 				archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
 			}
 		}
+		/*
 		stage('MultiArch Build') {
 			when {
-				not {
-					equals expected: 'UNSTABLE', actual: currentBuild.result
+				allOf {
+					branch 'master'
+					not {
+						equals expected: 'UNSTABLE', actual: currentBuild.result
+					}
 				}
 			}
 			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}"
+				withCredentials([string(credentialsId: 'npm-sentry-dsn', variable: 'SENTRY_DSN')]) {
+					withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
+						sh "docker login -u '${duser}' -p '${dpass}'"
+						// Buildx to local files
+						// sh './scripts/buildx -o type=local,dest=docker-build'
+						// Buildx to with push
+						sh "./scripts/buildx --push ${BUILDX_PUSH_TAGS}"
+					}
 				}
 			}
 		}
+		*/
 		stage('Docs Deploy') {
 			when {
 				allOf {
@@ -183,7 +177,7 @@ pipeline {
 				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 S3_BUCKET=$DOCS_BUCKET \\
 						-e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID \\
 						-e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY \\
 						-v \$(pwd):/app \\
@@ -197,7 +191,7 @@ pipeline {
 						-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 '/*'
+						aws cloudfront create-invalidation --distribution-id $DOCS_CDN --paths '/*'
 					"""
 				}
 			}
@@ -213,16 +207,50 @@ pipeline {
 			}
 			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.")
+					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}:git-3-${BRANCH_LOWER}`\n\n**Note:** ensure you backup your NPM instance before testing this PR image! Especially if this PR contains database changes.")
+				}
+			}
+		}
+		stage('Artifacts') {
+			when {
+				allOf {
+					branch 'master'
+					not {
+						equals expected: 'UNSTABLE', actual: currentBuild.result
+					}
+				}
+			}
+			steps {
+				sh 'mkdir -p artifacts'
+				// Docs
+				dir(path: 'docs/.vuepress/dist') {
+					sh 'zip -qr ../../../artifacts/docs.zip *'
+				}
+				// Multiarch builds
+				/*
+				dir(path: 'docker-build/linux_amd64/app') {
+					sh 'zip -qr ../../../artifacts/linux_amd64.zip *'
+				}
+				dir(path: 'docker-build/linux_arm64/app') {
+					sh 'zip -qr ../../../artifacts/linux_arm64.zip *'
+				}
+				dir(path: 'docker-build/linux_arm_v7/app') {
+					sh 'zip -qr ../../../artifacts/linux_arm_v7.zip *'
+				}
+				**/
+				// Archive them
+				dir(path: 'artifacts') {
+					archiveArtifacts artifacts: '**/*'
 				}
 			}
 		}
 	}
 	post {
 		always {
 			sh 'docker-compose down --rmi all --remove-orphans --volumes -t 30'
+			sh './scripts/build-cleanup'
 			sh 'echo Reverting ownership'
-			sh 'docker run --rm -v $(pwd):/data jc21/ci-tools chown -R $(id -u):$(id -g) /data'
+			sh 'docker run --rm -v $(pwd):/data node:latest chown -R "$(id -u):$(id -g)" /data'
 		}
 		success {
 			juxtapose event: 'success'