diff --git a/Jenkinsfile b/Jenkinsfile index 322f22f7..34a73b69 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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"' } 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. 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"