removed the find/chmod patch as it seems to make no difference while starting the container

This commit is contained in:
Micha Gläß-Stöcker 2021-06-20 09:50:41 +02:00
parent ed599da046
commit 2113a70115
3 changed files with 1 additions and 22 deletions

View file

@ -19,6 +19,5 @@ build:
- docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD
- git clone https://github.com/mondediefr/docker-flarum.git
- cd docker-flarum
- git apply ../chown-fix.patch
- docker buildx create --use --name A$CI_COMMIT_SHORT_SHA
- docker buildx build --platform $BUILD_PLATFORMS --push -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) -t $D_IMAGE_TAG -t $D_LATEST_TAG -t egon0/flarum-multiarch:$CI_COMMIT_REF_NAME-$(date +%Y-%m-%d) .

View file

@ -1 +1 @@
basically a build of https://github.com/mondediefr/docker-flarum with a patch to speed up the startup process of the container throug patching the find/chmod related parts
basically a build of https://github.com/mondediefr/docker-flarum for multiple architectures (amd64, arm64 and arm32)

View file

@ -1,20 +0,0 @@
diff --git a/rootfs/usr/local/bin/startup b/rootfs/usr/local/bin/startup
index b8ee399..55a8882 100644
--- a/rootfs/usr/local/bin/startup
+++ b/rootfs/usr/local/bin/startup
@@ -23,12 +23,11 @@ sed -i "s/<OPCACHE_MEMORY_LIMIT>/${OPCACHE_MEMORY_LIMIT}/g" /etc/php8/conf.d/00_
# Set permissions for /flarum folder
echo "[INFO] Setting folder permissions"
for folder in /etc/s6.d /run/php /var/log /var/lib/nginx; do
- find ${folder} ! -user "${UID}" -exec chown -h "${UID}:${GID}" {} \+
- find ${folder} ! -group "${GID}" -exec chown -h "${UID}:${GID}" {} \+
+ echo {$folder}
+ chown -R "${UID}:${GID}" ${folder}
done
-find /flarum ! -user "${UID}" -exec chown "${UID}:${GID}" {} \+
-find /flarum ! -group "${GID}" -exec chown "${UID}:${GID}" {} \+
+chown -R "${UID}:${GID}" /flarum
# Set log output to STDOUT if wanted (LOG_TO_STDOUT=true)
if [ "${LOG_TO_STDOUT}" = true ]; then