From efe32ca0f173e6a0b02b1c89c4fc178f7109f228 Mon Sep 17 00:00:00 2001
From: Joseph Ferguson <yosifkit@gmail.com>
Date: Fri, 31 Jan 2025 11:43:15 -0800
Subject: [PATCH] Add missing assets directory

fix "$filesOwnerMode" variable name
---
 5.0/alpine3.20/Dockerfile           | 3 ++-
 5.0/alpine3.20/docker-entrypoint.sh | 4 ++--
 5.0/alpine3.21/Dockerfile           | 3 ++-
 5.0/alpine3.21/docker-entrypoint.sh | 4 ++--
 5.0/bookworm/Dockerfile             | 3 ++-
 5.0/bookworm/docker-entrypoint.sh   | 4 ++--
 5.1/alpine3.20/Dockerfile           | 3 ++-
 5.1/alpine3.20/docker-entrypoint.sh | 4 ++--
 5.1/alpine3.21/Dockerfile           | 3 ++-
 5.1/alpine3.21/docker-entrypoint.sh | 4 ++--
 5.1/bookworm/Dockerfile             | 3 ++-
 5.1/bookworm/docker-entrypoint.sh   | 4 ++--
 6.0/alpine3.20/Dockerfile           | 3 ++-
 6.0/alpine3.20/docker-entrypoint.sh | 4 ++--
 6.0/alpine3.21/Dockerfile           | 3 ++-
 6.0/alpine3.21/docker-entrypoint.sh | 4 ++--
 6.0/bookworm/Dockerfile             | 3 ++-
 6.0/bookworm/docker-entrypoint.sh   | 4 ++--
 Dockerfile.template                 | 3 ++-
 docker-entrypoint.sh                | 4 ++--
 20 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/5.0/alpine3.20/Dockerfile b/5.0/alpine3.20/Dockerfile
index 2596004..732785c 100644
--- a/5.0/alpine3.20/Dockerfile
+++ b/5.0/alpine3.20/Dockerfile
@@ -78,7 +78,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.0/alpine3.20/docker-entrypoint.sh b/5.0/alpine3.20/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.0/alpine3.20/docker-entrypoint.sh
+++ b/5.0/alpine3.20/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/5.0/alpine3.21/Dockerfile b/5.0/alpine3.21/Dockerfile
index d1eb978..f6d9ad0 100644
--- a/5.0/alpine3.21/Dockerfile
+++ b/5.0/alpine3.21/Dockerfile
@@ -78,7 +78,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.0/alpine3.21/docker-entrypoint.sh b/5.0/alpine3.21/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.0/alpine3.21/docker-entrypoint.sh
+++ b/5.0/alpine3.21/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/5.0/bookworm/Dockerfile b/5.0/bookworm/Dockerfile
index d60dde1..1275390 100644
--- a/5.0/bookworm/Dockerfile
+++ b/5.0/bookworm/Dockerfile
@@ -81,7 +81,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.0/bookworm/docker-entrypoint.sh b/5.0/bookworm/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.0/bookworm/docker-entrypoint.sh
+++ b/5.0/bookworm/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/5.1/alpine3.20/Dockerfile b/5.1/alpine3.20/Dockerfile
index 7d53955..7e03d0d 100644
--- a/5.1/alpine3.20/Dockerfile
+++ b/5.1/alpine3.20/Dockerfile
@@ -78,7 +78,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.1/alpine3.20/docker-entrypoint.sh b/5.1/alpine3.20/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.1/alpine3.20/docker-entrypoint.sh
+++ b/5.1/alpine3.20/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/5.1/alpine3.21/Dockerfile b/5.1/alpine3.21/Dockerfile
index c305c35..db3ca6e 100644
--- a/5.1/alpine3.21/Dockerfile
+++ b/5.1/alpine3.21/Dockerfile
@@ -78,7 +78,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.1/alpine3.21/docker-entrypoint.sh b/5.1/alpine3.21/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.1/alpine3.21/docker-entrypoint.sh
+++ b/5.1/alpine3.21/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/5.1/bookworm/Dockerfile b/5.1/bookworm/Dockerfile
index 232a913..86f2fa0 100644
--- a/5.1/bookworm/Dockerfile
+++ b/5.1/bookworm/Dockerfile
@@ -81,7 +81,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/5.1/bookworm/docker-entrypoint.sh b/5.1/bookworm/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/5.1/bookworm/docker-entrypoint.sh
+++ b/5.1/bookworm/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/6.0/alpine3.20/Dockerfile b/6.0/alpine3.20/Dockerfile
index 82ce3a5..3cfec67 100644
--- a/6.0/alpine3.20/Dockerfile
+++ b/6.0/alpine3.20/Dockerfile
@@ -77,7 +77,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/6.0/alpine3.20/docker-entrypoint.sh b/6.0/alpine3.20/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/6.0/alpine3.20/docker-entrypoint.sh
+++ b/6.0/alpine3.20/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/6.0/alpine3.21/Dockerfile b/6.0/alpine3.21/Dockerfile
index efc7aef..e86af5b 100644
--- a/6.0/alpine3.21/Dockerfile
+++ b/6.0/alpine3.21/Dockerfile
@@ -77,7 +77,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/6.0/alpine3.21/docker-entrypoint.sh b/6.0/alpine3.21/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/6.0/alpine3.21/docker-entrypoint.sh
+++ b/6.0/alpine3.21/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/6.0/bookworm/Dockerfile b/6.0/bookworm/Dockerfile
index 0f7c62d..f570006 100644
--- a/6.0/bookworm/Dockerfile
+++ b/6.0/bookworm/Dockerfile
@@ -81,7 +81,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/6.0/bookworm/docker-entrypoint.sh b/6.0/bookworm/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/6.0/bookworm/docker-entrypoint.sh
+++ b/6.0/bookworm/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi
diff --git a/Dockerfile.template b/Dockerfile.template
index 46bbcf4..e570fd9 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -131,7 +131,8 @@ RUN set -eux; \
 	echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
 	tar -xf redmine.tar.gz --strip-components=1; \
 	rm redmine.tar.gz files/delete.me log/delete.me; \
-	mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
+	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
+	mkdir -p log public/assets public/plugin_assets sqlite tmp/pdf tmp/pids; \
 	chown -R redmine:redmine ./; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX config db sqlite; \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 9a1640a..b143073 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -31,14 +31,14 @@ esac
 
 _fix_permissions() {
 	# https://www.redmine.org/projects/redmine/wiki/RedmineInstall#Step-8-File-system-permissions
-	local dirs=( config log public/plugin_assets tmp ) args=()
+	local dirs=( config log public/assets public/plugin_assets tmp ) args=()
 	if [ "$(id -u)" = '0' ]; then
 		args+=( ${args[@]:+,} '(' '!' -user redmine -exec chown redmine:redmine '{}' + ')' )
 
 		# https://github.com/docker-library/redmine/issues/268 - scanning "files" might be *really* expensive, so we should skip it if it seems like it's "already correct"
 		local filesOwnerMode
 		filesOwnerMode="$(stat -c '%U:%a' files)"
-		if [ "$files" != 'redmine:755' ]; then
+		if [ "$filesOwnerMode" != 'redmine:755' ]; then
 			dirs+=( files )
 		fi
 	fi