Mirrored_Repos/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/jc21/nginx-proxy-manager.git synced 2024-08-30 18:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2764 from NginxProxyManager/develop

Browse Source 
v2.10.1
This commit is contained in:
jc21 2023-03-29 08:54:30 +10:00 committed by GitHub
commit c197e66d62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.version
View File

@ -1 +1 @@
2.10.0 2.10.1

8
Jenkinsfile vendored
View File

@ -90,13 +90,13 @@ pipeline {
steps { steps {
// Bring up a stack // Bring up a stack
sh 'docker-compose up -d fullstack-sqlite' sh 'docker-compose up -d fullstack-sqlite'
sh './scripts/wait-healthy $(docker-compose ps -q fullstack-sqlite) 120' sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-sqlite) 120'
// Run tests // Run tests
sh 'rm -rf test/results' sh 'rm -rf test/results'
sh 'docker-compose up cypress-sqlite' sh 'docker-compose up cypress-sqlite'
// Get results // Get results
sh 'docker cp -L "$(docker-compose ps -q cypress-sqlite):/test/results" test/' sh 'docker cp -L "$(docker-compose ps --all -q cypress-sqlite):/test/results" test/'
} }
post { post {
always { always {
@ -116,13 +116,13 @@ pipeline {
steps { steps {
// Bring up a stack // Bring up a stack
sh 'docker-compose up -d fullstack-mysql' sh 'docker-compose up -d fullstack-mysql'
sh './scripts/wait-healthy $(docker-compose ps -q fullstack-mysql) 120' sh './scripts/wait-healthy $(docker-compose ps --all -q fullstack-mysql) 120'
// Run tests // Run tests
sh 'rm -rf test/results' sh 'rm -rf test/results'
sh 'docker-compose up cypress-mysql' sh 'docker-compose up cypress-mysql'
// Get results // Get results
sh 'docker cp -L "$(docker-compose ps -q cypress-mysql):/test/results" test/' sh 'docker cp -L "$(docker-compose ps --all -q cypress-mysql):/test/results" test/'
} }
post { post {
always { always {

2
README.md
View File

@ -1,7 +1,7 @@
<p align="center"> <p align="center">
<img src="https://nginxproxymanager.com/github.png"> <img src="https://nginxproxymanager.com/github.png">
<br><br> <br><br>
<img src="https://img.shields.io/badge/version-2.10.0-green.svg?style=for-the-badge"> <img src="https://img.shields.io/badge/version-2.10.1-green.svg?style=for-the-badge">
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager"> <a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge"> <img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
</a> </a>

22
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/30-ownership.sh
View File

@ -9,13 +9,15 @@ log_info 'Setting ownership ...'
chown root /tmp/nginx chown root /tmp/nginx
# npmuser # npmuser
chown -R npmuser:npmuser \ chown -R npmuser:npmuser /data
/data \ chown -R npmuser:npmuser /etc/letsencrypt
/etc/letsencrypt \ chown -R npmuser:npmuser /run/nginx
/etc/nginx \ chown -R npmuser:npmuser /tmp/nginx
/run/nginx \ chown -R npmuser:npmuser /var/cache/nginx
/tmp/nginx \ chown -R npmuser:npmuser /var/lib/logrotate
/var/cache/nginx \ chown -R npmuser:npmuser /var/lib/nginx
/var/lib/logrotate \ chown -R npmuser:npmuser /var/log/nginx
/var/lib/nginx \
/var/log/nginx # Don't chown entire /etc/nginx folder as this causes crashes on some systems
chown -R npmuser:npmuser /etc/nginx/nginx.conf
chown -R npmuser:npmuser /etc/nginx/conf.d

0
docker/rootfs/etc/s6-overlay/s6-rc.d/prepare/50-ipv6.sh Normal file → Executable file
View File