From 93f29734b745fcdaf59ac2c2540a21c0346f25b3 Mon Sep 17 00:00:00 2001 From: jc21 Date: Fri, 6 Mar 2020 11:04:42 +1000 Subject: [PATCH 1/6] Version 2.1.2 (#317) * Tweaks and backend vscode settings * Version bump --- .version | 2 +- README.md | 2 +- backend/.vscode/settings.json | 8 ++++++++ backend/package.json | 2 +- docker/Dockerfile | 1 - frontend/package.json | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 backend/.vscode/settings.json diff --git a/.version b/.version index 7c327287..eca07e4c 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -2.1.1 \ No newline at end of file +2.1.2 diff --git a/README.md b/README.md index 680304f9..61f4d59b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Nginx Proxy Manager -![Version](https://img.shields.io/badge/version-2.1.1-green.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/version-2.1.2-green.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) diff --git a/backend/.vscode/settings.json b/backend/.vscode/settings.json new file mode 100644 index 00000000..4e540ab3 --- /dev/null +++ b/backend/.vscode/settings.json @@ -0,0 +1,8 @@ +{ + "editor.insertSpaces": false, + "editor.formatOnSave": true, + "files.trimTrailingWhitespace": true, + "editor.codeActionsOnSave": { + "source.fixAll.eslint": true + } +} \ No newline at end of file diff --git a/backend/package.json b/backend/package.json index f58b2256..709e984c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "nginx-proxy-manager", - "version": "2.1.1", + "version": "2.1.2", "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "dependencies": { diff --git a/docker/Dockerfile b/docker/Dockerfile index f07b5f07..a08549a0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -30,7 +30,6 @@ RUN /tmp/install-s6 "${TARGETPLATFORM}" && rm -f /tmp/install-s6 EXPOSE 80 EXPOSE 81 EXPOSE 443 -EXPOSE 9876 COPY docker/rootfs / ADD backend /app diff --git a/frontend/package.json b/frontend/package.json index 85aeaa80..8ad6ca81 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "nginx-proxy-manager", - "version": "2.1.1", + "version": "2.1.2", "description": "A beautiful interface for creating Nginx endpoints", "main": "js/index.js", "devDependencies": { From 8fb2821343888d2f036d07f72e5b26efabe90067 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Fri, 6 Mar 2020 12:54:05 +1000 Subject: [PATCH 2/6] Get artifacts on build fail --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 322f22f7..d8921cd1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -149,6 +149,7 @@ pipeline { sh 'figlet "SUCCESS"' } failure { + archiveArtifacts(artifacts: 'debug/**.*', allowEmptyArchive: true) juxtapose event: 'failure' sh 'figlet "FAILURE"' } From 3ddd3b49fd13131a90bde1373fbd3fe56f0867f4 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Fri, 6 Mar 2020 13:11:04 +1000 Subject: [PATCH 3/6] Re-order post testing steps --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d8921cd1..fbb769c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,14 +93,14 @@ pipeline { } post { always { - junit 'test/results/junit/*' + // Dumps to analyze later + sh 'mkdir -p debug' + 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' } - // Dumps to analyze later - sh 'mkdir -p debug' - sh 'docker-compose logs fullstack | gzip > debug/docker_fullstack.log.gz' + junit 'test/results/junit/*' } } } From 1a15b4f18d550a374d069392fa3512b2520e688d Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Fri, 6 Mar 2020 13:21:13 +1000 Subject: [PATCH 4/6] Also archive db ci log --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index fbb769c8..34a73b69 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -96,6 +96,7 @@ pipeline { // Dumps to analyze later sh 'mkdir -p debug' sh 'docker-compose logs fullstack | gzip > debug/docker_fullstack.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' From af319b472967c788eda6cdc8a020808ccd06979d Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Mon, 9 Mar 2020 15:22:24 +1000 Subject: [PATCH 5/6] Updated doc and example to use jc21/mariadb-aria now that it supports multiple arch --- doc/INSTALL.md | 2 +- doc/example/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/INSTALL.md b/doc/INSTALL.md index f86a1784..1309a889 100644 --- a/doc/INSTALL.md +++ b/doc/INSTALL.md @@ -74,7 +74,7 @@ services: depends_on: - db db: - image: mariadb:latest + image: jc21/mariadb-aria:latest restart: always environment: MYSQL_ROOT_PASSWORD: "npm" diff --git a/doc/example/docker-compose.yml b/doc/example/docker-compose.yml index e6707b95..3526e8e5 100644 --- a/doc/example/docker-compose.yml +++ b/doc/example/docker-compose.yml @@ -17,7 +17,7 @@ services: # if you want pretty colors in your docker logs: - FORCE_COLOR=1 db: - image: mariadb:latest + image: jc21/mariadb-aria:latest restart: always environment: MYSQL_ROOT_PASSWORD: "npm" From 1b6993ee709d191ad3d3d63de98d46b9a459166c Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Tue, 10 Mar 2020 09:59:34 +1000 Subject: [PATCH 6/6] Added better Build Badge --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 61f4d59b..bd8c5f36 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,7 @@ ![Version](https://img.shields.io/badge/version-2.1.2-green.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) - -[![Build Status](https://ci.nginxproxymanager.jc21.com/buildStatus/icon?job=nginx-proxy-manager%2Fmaster&style=flat-square)](https://ci.nginxproxymanager.jc21.com/job/nginx-proxy-manager/job/master/) +![Jenkins](https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.nginxproxymanager.com%2Fjob%2Fnginx-proxy-manager%2Fjob%2Fmaster&style=for-the-badge) This project comes as a pre-built docker image that enables you to easily forward to your websites running at home or otherwise, including free SSL, without having to know too much about Nginx or Letsencrypt.