bastion/nginx-proxy-manager
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2' of github.com:jc21/nginx-proxy-manager

Browse Source
This commit is contained in:
Jamie Curnow
2018-08-30 14:32:46 +10:00
parent 2226359cfe a4b918e648
commit 32d6bf83c8
378 changed files with 18583 additions and 7537 deletions
.babelrc.gitignoreDockerfileDockerfile.armhfJenkinsfileREADME.mdTODO.md
bin
buildbuild-devgulpnpmyarn
config
README.mddefault.jsonmy.cnf
doc
DOCKERHUB.mdIMPORTING.mdINSTALL.md
example
config.jsondocker-compose.yml
docker-compose.ymlknexfile.js
manager/src
backend
db.jsindex.js
internal
access.jshost.jsnginx.jsssl.js
lib
error.js
logger.js
routes
api
access.jshosts.jsmain.js
main.js
schema
definitions.json
endpoints
access.jsonhosts.json
examples.jsonindex.json
templates
404.conf.ejsletsencrypt.conf.ejsproxy.conf.ejsredirection.conf.ejsstream.conf.ejs
frontend
fonts
bootstrap
glyphicons-halflings-regular.eotglyphicons-halflings-regular.svgglyphicons-halflings-regular.ttfglyphicons-halflings-regular.woffglyphicons-halflings-regular.woff2
font-awesome
FontAwesome.otffontawesome-webfont.eotfontawesome-webfont.svgfontawesome-webfont.ttffontawesome-webfont.wofffontawesome-webfont.woff2
js
app
access
empty.ejsmain.ejsrow.ejs
access_list
delete.ejsform.ejsitem.ejs
cache.js
dashboard
empty.ejsmain.ejsrow.ejs
error
main.ejs
host
404_form.ejsadvanced.ejsdelete.ejsproxy_form.ejsreconfigure.ejsredirection_form.ejsstream_form.ejs
router.js
ui
header
main.ejs
main.ejs
scss
fontawesome
_animated.scss_bordered-pulled.scss_core.scss_fixed-width.scss_icons.scss_larger.scss_list.scss_mixins.scss_path.scss_rotated-flipped.scss_screen-reader.scss_stacked.scss_variables.scssfont-awesome.scss
pages
access-list-form.scssadvanced-input.scssapp.scss
styles.scsstheme.scss
theme
header.scssloader.scssmain.scss
views
includes
footer.ejsheader.ejs
index.ejs
nodemon.jsonpackage.json
rootfs
etc
nginx
conf.d
default.conf
include
letsencrypt-acme-challenge.conf
mime.typesnginx.conf
services.d
manager
run
nginx
run
root
.config
letsencrypt
cli.ini
var
www
html
index.html
src
backend
app.jsdb.jsimporter.jsindex.js
internal
access-list.jsaudit-log.jscertificate.jsdead-host.jshost.jsnginx.jsproxy-host.jsredirection-host.jsreport.jsstream.jstoken.jsuser.js
lib
access.js
access
access_lists-create.jsonaccess_lists-delete.jsonaccess_lists-get.jsonaccess_lists-list.jsonaccess_lists-update.jsonauditlog-list.jsoncertificates-create.jsoncertificates-delete.jsoncertificates-get.jsoncertificates-list.jsoncertificates-update.jsondead_hosts-create.jsondead_hosts-delete.jsondead_hosts-get.jsondead_hosts-list.jsondead_hosts-update.jsonpermissions.jsonproxy_hosts-create.jsonproxy_hosts-delete.jsonproxy_hosts-get.jsonproxy_hosts-list.jsonproxy_hosts-update.jsonredirection_hosts-create.jsonredirection_hosts-delete.jsonredirection_hosts-get.jsonredirection_hosts-list.jsonredirection_hosts-update.jsonreports-hosts.jsonroles.jsonstreams-create.jsonstreams-delete.jsonstreams-get.jsonstreams-list.jsonstreams-update.jsonusers-create.jsonusers-delete.jsonusers-get.jsonusers-list.jsonusers-loginas.jsonusers-password.jsonusers-permissions.jsonusers-update.json
error.js
express
cors.jsjwt-decode.jsjwt.jspagination.jsuser-id-from-me.js
helpers.jsmigrate_template.jsutils.js
validator
api.jsindex.js
logger.jsmigrate.js
migrations
20180618015850_initial.js
models
access_list.jsaccess_list_auth.jsaudit-log.jsauth.jscertificate.jsdead_host.jsproxy_host.jsredirection_host.jsstream.jstoken.jsuser.jsuser_permission.js
routes
api
audit-log.jsmain.js
nginx
access_lists.jscertificates.jsdead_hosts.jsproxy_hosts.jsredirection_hosts.jsstreams.js
reports.jstokens.jsusers.js
main.js
schema
definitions.json
endpoints
access-lists.jsoncertificates.jsondead-hosts.jsonproxy-hosts.jsonredirection-hosts.jsonstreams.jsontokens.jsonusers.json
examples.jsonindex.json
setup.js
templates
_assets.conf_certificates.conf_exploits.conf_forced_ssl.conf_header_comment.conf_listen.confdead_host.confletsencrypt-request.confproxy_host.confredirection_host.confstream.conf
views
index.ejslogin.ejs
partials
footer.ejsheader.ejs
frontend
app-images
default-avatar.jpg
favicons
android-chrome-192x192.pngandroid-chrome-512x512.pngapple-touch-icon.pngbrowserconfig.xmlfavicon-16x16.pngfavicon-32x32.pngfavicon.icomanifest.jsonmstile-150x150.pngsafari-pinned-tab.svg
fontsimages
js
app
api.js
audit-log
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.jsmeta.ejsmeta.js
cache.jscontroller.js
dashboard
main.ejsmain.js
empty
main.ejsmain.js
error
main.ejsmain.js
help
main.ejsmain.js
i18n.jsmain.js
nginx
access
delete.ejsdelete.jsform.ejsform.js
form
item.ejsitem.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
certificates-list-item.ejs
certificates
delete.ejsdelete.jsform.ejsform.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
dead
delete.ejsdelete.jsform.ejsform.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
proxy
access-list-item.ejsdelete.ejsdelete.jsform.ejsform.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
redirection
delete.ejsdelete.jsform.ejsform.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
stream
delete.ejsdelete.jsform.ejsform.js
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
router.jstokens.js
ui
footer
main.ejsmain.js
header
main.ejsmain.js
main.ejsmain.js
menu
main.ejsmain.js
user
delete.ejsdelete.jsform.ejsform.jspassword.ejspassword.jspermissions.ejspermissions.js
users
list
item.ejsitem.jsmain.ejsmain.js
main.ejsmain.js
i18n
messages.json
index.js
lib
helpers.jsmarionette.js
login.js
login
main.js
ui
login.ejslogin.js
models
access-list.jsaudit-log.jscertificate.jsdead-host.jsproxy-host.jsredirection-host.jsstream.jsuser.js
scss
custom.scssselectize.scssstyles.scsstabler-extra.scss
webpack.config.js

55
Jenkinsfile vendored

@ -6,12 +6,18 @@ pipeline {
agent any
environment {
IMAGE_NAME = "nginx-proxy-manager"
BASE_IMAGE_NAME = "jc21/nginx-proxy-manager-base:v2"
TEMP_IMAGE_NAME = "nginx-proxy-manager-build_${BUILD_NUMBER}"
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-armhf-build_${BUILD_NUMBER}"
TEMP_IMAGE_NAME_ARM = "nginx-proxy-manager-arm-build_${BUILD_NUMBER}"
TAG_VERSION = getPackageVersion()
MAJOR_VERSION = "1"
MAJOR_VERSION = "2"
}
stages {
stage('Prepare') {
steps {
sh 'docker pull $DOCKER_CI_TOOLS'
}
}
stage('Build') {
parallel {
stage('x86_64') {
@ -21,34 +27,33 @@ pipeline {
steps {
ansiColor('xterm') {
// Codebase
sh 'docker pull jc21/$IMAGE_NAME-base'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base gulp build'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn --registry=$NPM_REGISTRY install'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME npm run-script build'
sh 'rm -rf node_modules'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base yarn --registry=$NPM_REGISTRY install --prod'
sh 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS node-prune'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME yarn --registry=$NPM_REGISTRY install --prod'
sh 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS node-prune'
// Docker Build
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME .'
// Private Registry
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest'
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$MAJOR_VERSION'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$MAJOR_VERSION'
// Dockerhub
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION'
sh 'docker tag $TEMP_IMAGE_NAME docker.io/jc21/$IMAGE_NAME:latest'
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
sh "docker login -u '${duser}' -p '$dpass'"
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION'
sh 'docker push docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION'
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest'
}
sh 'docker rmi $TEMP_IMAGE_NAME'
@ -65,32 +70,32 @@ pipeline {
steps {
ansiColor('xterm') {
// Codebase
sh 'docker pull jc21/$IMAGE_NAME-base:armhf'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf gulp build'
sh 'docker run --rm -v $(pwd)/manager:/srv/manager -w /srv/manager jc21/$IMAGE_NAME-base:armhf yarn --registry=$NPM_REGISTRY install --prod'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf yarn --registry=$NPM_REGISTRY install'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf npm run-script build'
sh 'rm -rf node_modules'
sh 'docker run --rm -v $(pwd):/app -w /app $BASE_IMAGE_NAME-armhf yarn --registry=$NPM_REGISTRY install --prod'
// Docker Build
sh 'docker build --pull --no-cache --squash --compress -f Dockerfile.armhf -t $TEMP_IMAGE_NAME_ARM .'
sh 'docker build --pull --no-cache --squash --compress -t $TEMP_IMAGE_NAME_ARM -f Dockerfile.armhf .'
// Private Registry
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-armhf'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:$MAJOR_VERSION-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
sh 'docker push $DOCKER_PRIVATE_REGISTRY/$IMAGE_NAME:latest-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$MAJOR_VERSION-armhf'
sh 'docker push ${DOCKER_PRIVATE_REGISTRY}/$IMAGE_NAME:$MAJOR_VERSION-armhf'
// Dockerhub
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-armhf'
sh 'docker tag $TEMP_IMAGE_NAME_ARM docker.io/jc21/$IMAGE_NAME:latest-armhf'
withCredentials([usernamePassword(credentialsId: 'jc21-dockerhub', passwordVariable: 'dpass', usernameVariable: 'duser')]) {
sh "docker login -u '${duser}' -p '$dpass'"
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
sh 'docker push docker.io/jc21/$IMAGE_NAME:$TAG_VERSION-armhf'
sh 'docker push docker.io/jc21/$IMAGE_NAME:$MAJOR_VERSION-armhf'
sh 'docker push docker.io/jc21/$IMAGE_NAME:latest-armhf'
}
sh 'docker rmi $TEMP_IMAGE_NAME_ARM'
@ -113,7 +118,7 @@ pipeline {
}
def getPackageVersion() {
ver = sh(script: 'docker run --rm -v $(pwd)/manager:/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
ver = sh(script: 'docker run --rm -v $(pwd):/data $DOCKER_CI_TOOLS bash -c "cat /data/package.json|jq -r \'.version\'"', returnStdout: true)
return ver.trim()
}