Add missing assets directory

fix "$filesOwnerMode" variable name
docker-library · Jan 31, 2025 · efe32ca · efe32ca
1 parent 7c01630
commit efe32ca
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 30 deletions.
diff --git a/5.0/alpine3.20/Dockerfile b/5.0/alpine3.20/Dockerfile
diff --git a/5.0/alpine3.20/docker-entrypoint.sh b/5.0/alpine3.20/docker-entrypoint.sh
diff --git a/5.0/alpine3.21/Dockerfile b/5.0/alpine3.21/Dockerfile
diff --git a/5.0/alpine3.21/docker-entrypoint.sh b/5.0/alpine3.21/docker-entrypoint.sh
diff --git a/5.0/bookworm/Dockerfile b/5.0/bookworm/Dockerfile
diff --git a/5.0/bookworm/docker-entrypoint.sh b/5.0/bookworm/docker-entrypoint.sh
diff --git a/5.1/alpine3.20/Dockerfile b/5.1/alpine3.20/Dockerfile
diff --git a/5.1/alpine3.20/docker-entrypoint.sh b/5.1/alpine3.20/docker-entrypoint.sh
diff --git a/5.1/alpine3.21/Dockerfile b/5.1/alpine3.21/Dockerfile
diff --git a/5.1/alpine3.21/docker-entrypoint.sh b/5.1/alpine3.21/docker-entrypoint.sh
diff --git a/5.1/bookworm/Dockerfile b/5.1/bookworm/Dockerfile
diff --git a/5.1/bookworm/docker-entrypoint.sh b/5.1/bookworm/docker-entrypoint.sh
diff --git a/6.0/alpine3.20/Dockerfile b/6.0/alpine3.20/Dockerfile
diff --git a/6.0/alpine3.20/docker-entrypoint.sh b/6.0/alpine3.20/docker-entrypoint.sh
diff --git a/6.0/alpine3.21/Dockerfile b/6.0/alpine3.21/Dockerfile
diff --git a/6.0/alpine3.21/docker-entrypoint.sh b/6.0/alpine3.21/docker-entrypoint.sh
diff --git a/6.0/bookworm/Dockerfile b/6.0/bookworm/Dockerfile
diff --git a/6.0/bookworm/docker-entrypoint.sh b/6.0/bookworm/docker-entrypoint.sh
diff --git 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
@@ -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