Compare commits

..

6 Commits

Author SHA1 Message Date
af319b4729 Updated doc and example to use jc21/mariadb-aria now that it supports multiple arch 2020-03-09 15:22:24 +10:00
1a15b4f18d Also archive db ci log 2020-03-06 13:21:13 +10:00
3ddd3b49fd Re-order post testing steps 2020-03-06 13:11:04 +10:00
e2c4b32311 Merge branch 'master' of github.com:jc21/nginx-proxy-manager 2020-03-06 12:54:15 +10:00
8fb2821343 Get artifacts on build fail 2020-03-06 12:54:05 +10:00
93f29734b7 Version 2.1.2 (#317)
* Tweaks and backend vscode settings

* Version bump
2020-03-06 11:04:42 +10:00
9 changed files with 20 additions and 11 deletions

View File

@ -1 +1 @@
2.1.1
2.1.2

10
Jenkinsfile vendored
View File

@ -93,14 +93,15 @@ 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'
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'
}
// Dumps to analyze later
sh 'mkdir -p debug'
sh 'docker-compose logs fullstack | gzip > debug/docker_fullstack.log.gz'
junit 'test/results/junit/*'
}
}
}
@ -149,6 +150,7 @@ pipeline {
sh 'figlet "SUCCESS"'
}
failure {
archiveArtifacts(artifacts: 'debug/**.*', allowEmptyArchive: true)
juxtapose event: 'failure'
sh 'figlet "FAILURE"'
}

View File

@ -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)

8
backend/.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,8 @@
{
"editor.insertSpaces": false,
"editor.formatOnSave": true,
"files.trimTrailingWhitespace": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
}
}

View File

@ -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": {

View File

@ -74,7 +74,7 @@ services:
depends_on:
- db
db:
image: mariadb:latest
image: jc21/mariadb-aria:latest
restart: always
environment:
MYSQL_ROOT_PASSWORD: "npm"

View File

@ -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"

View File

@ -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

View File

@ -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": {