From 67e8ca6714622276efa5c12383142745b6020f85 Mon Sep 17 00:00:00 2001
From: chaptergy <git@chaptergy.xyz>
Date: Thu, 22 Jul 2021 14:05:21 +0200
Subject: [PATCH 1/4] Fixes crash when logrotate fails
---
backend/setup.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/backend/setup.js b/backend/setup.js
index 44673b3..4d614ba 100644
--- a/backend/setup.js
+++ b/backend/setup.js
@@ -210,8 +210,10 @@ const setupLogrotation = () => {
const intervalTimeout = 1000 * 60 * 60 * 24 * 2; // 2 days
const runLogrotate = async () => {
- await utils.exec('logrotate /etc/logrotate.d/nginx-proxy-manager');
- logger.info('Logrotate completed.');
+ try {
+ await utils.exec('logrotate /etc/logrotate.d/nginx-proxy-manager');
+ logger.info('Logrotate completed.');
+ } catch (e) { logger.warn(e); }
};
logger.info('Logrotate Timer initialized');
From fbae107c04e1ea11c358433ca68ad7e8718c5cec Mon Sep 17 00:00:00 2001
From: chaptergy <git@chaptergy.xyz>
Date: Fri, 23 Jul 2021 09:11:43 +0200
Subject: [PATCH 2/4] Changes owner of logs to root on every container start
---
docker/rootfs/etc/cont-init.d/01_perms.sh | 4 ++++
1 file changed, 4 insertions(+)
create mode 100755 docker/rootfs/etc/cont-init.d/01_perms.sh
diff --git a/docker/rootfs/etc/cont-init.d/01_perms.sh b/docker/rootfs/etc/cont-init.d/01_perms.sh
new file mode 100755
index 0000000..669a0b7
--- /dev/null
+++ b/docker/rootfs/etc/cont-init.d/01_perms.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+mkdir -p /data/logs
+chown -R root:root /data/logs
\ No newline at end of file
From f2acb9e150a736391791527b98c0193abb2f870e Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Sun, 25 Jul 2021 21:09:02 +1000
Subject: [PATCH 3/4] Tweaks to s6 scripts
---
docker/rootfs/etc/cont-init.d/01_perms.sh | 5 ++++-
scripts/start-dev | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/docker/rootfs/etc/cont-init.d/01_perms.sh b/docker/rootfs/etc/cont-init.d/01_perms.sh
index 669a0b7..e7875d3 100755
--- a/docker/rootfs/etc/cont-init.d/01_perms.sh
+++ b/docker/rootfs/etc/cont-init.d/01_perms.sh
@@ -1,4 +1,7 @@
#!/usr/bin/with-contenv bash
+set -e
mkdir -p /data/logs
-chown -R root:root /data/logs
\ No newline at end of file
+echo "Changing ownership of /data/logs to $(id -u):$(id -g)"
+chown -R "$(id -u):$(id -g)" /data/logs
+
diff --git a/scripts/start-dev b/scripts/start-dev
index a5e647f..f064a4b 100755
--- a/scripts/start-dev
+++ b/scripts/start-dev
@@ -18,10 +18,10 @@ if hash docker-compose 2>/dev/null; then
if [ "$1" == "-f" ]; then
echo -e "${BLUE}❯ ${YELLOW}Following Backend Container:${RESET}"
- docker logs -f npmdev_npm_1
+ docker logs -f npm_core
else
echo -e "${YELLOW}Hint:${RESET} You can follow the output of some of the containers with:"
- echo " docker logs -f npmdev_npm_1"
+ echo " docker logs -f npm_core"
fi
else
echo -e "${RED}❯ docker-compose command is not available${RESET}"
From 8aded1a6855b74bb9f326c696f7fc7c53c01b65d Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Sun, 25 Jul 2021 21:10:26 +1000
Subject: [PATCH 4/4] Bump version
---
.version | 2 +-
README.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.version b/.version
index 1acd4da..23ae1b5 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.9.5
+2.9.6
diff --git a/README.md b/README.md
index 8916b99..dd8a6c7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
<p align="center">
<img src="https://nginxproxymanager.com/github.png">
<br><br>
- <img src="https://img.shields.io/badge/version-2.9.5-green.svg?style=for-the-badge">
+ <img src="https://img.shields.io/badge/version-2.9.6-green.svg?style=for-the-badge">
<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">
</a>