Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge branch 'develop' of https://github.com/jc21/nginx-proxy-manager into feature/custom-locations

Browse source
This commit is contained in:
kolbii 2019-03-02 21:49:41 +01:00
commit 9eb6e29c8c
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Jenkinsfile vendored
View file

@ -81,11 +81,11 @@ pipeline {
} }
} }
stage('Build Master') { stage('Build Master') {
when {
branch 'master'
}
parallel { parallel {
stage('x86_64') { stage('x86_64') {
when {
branch 'master'
}
steps { steps {
ansiColor('xterm') { ansiColor('xterm') {
// Codebase // Codebase
@ -127,9 +127,6 @@ pipeline {
} }
} }
stage('armhf') { stage('armhf') {
when {
branch 'master'
}
agent { agent {
label 'armhf' label 'armhf'
} }
@ -173,9 +170,6 @@ pipeline {
} }
} }
stage('arm64') { stage('arm64') {
when {
branch 'master'
}
agent { agent {
label 'arm64' label 'arm64'
} }

2
README.md
View file

@ -2,7 +2,7 @@
# Nginx Proxy Manager # Nginx Proxy Manager
![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge) ![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

2
doc/DOCKERHUB.md
View file

@ -2,7 +2,7 @@
# Nginx Proxy Manager # Nginx Proxy Manager
![Version](https://img.shields.io/badge/version-2.0.9-green.svg?style=for-the-badge) ![Version](https://img.shields.io/badge/version-2.0.10-green.svg?style=for-the-badge)
![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge)
![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "nginx-proxy-manager", "name": "nginx-proxy-manager",
"version": "2.0.9", "version": "2.0.10",
"description": "A beautiful interface for creating Nginx endpoints", "description": "A beautiful interface for creating Nginx endpoints",
"main": "src/backend/index.js", "main": "src/backend/index.js",
"devDependencies": { "devDependencies": {