Skip to content

Commit 288cb8d

Browse files
committed
Remove -tmp logic
1 parent 1603fb1 commit 288cb8d

File tree

4 files changed

+4
-9
lines changed

4 files changed

+4
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN \
5252
echo "**** install composer dependencies ****" && \
5353
composer install -d /app/www/ && \
5454
echo "**** overlay-fs bug workaround ****" && \
55-
mv /app/www /app/www-tmp && \
55+
mv /app/www /app/www && \
5656
echo "**** cleanup ****" && \
5757
apk del --purge \
5858
build-dependencies && \

Dockerfile.aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN \
5252
echo "**** install composer dependencies ****" && \
5353
composer install -d /app/www/ && \
5454
echo "**** overlay-fs bug workaround ****" && \
55-
mv /app/www /app/www-tmp && \
55+
mv /app/www /app/www && \
5656
echo "**** cleanup ****" && \
5757
apk del --purge \
5858
build-dependencies && \

Dockerfile.armhf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN \
5252
echo "**** install composer dependencies ****" && \
5353
composer install -d /app/www/ && \
5454
echo "**** overlay-fs bug workaround ****" && \
55-
mv /app/www /app/www-tmp && \
55+
mv /app/www /app/www && \
5656
echo "**** cleanup ****" && \
5757
apk del --purge \
5858
build-dependencies && \

root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
#!/usr/bin/with-contenv bash
22
# shellcheck shell=bash
33

4-
if [ -d /app/www-tmp ]; then
5-
echo "New container detected. Setting up app folder and fixing permissions."
6-
mv /app/www-tmp /app/www
7-
lsiown -R abc:abc /app/www
8-
fi
9-
104
# create directory structure
115
mkdir -p \
126
/config/www/{uploads,files,images,themes}
@@ -147,6 +141,7 @@ fi
147141

148142
# permissions
149143
lsiown -R abc:abc \
144+
/app/www/storage \
150145
/config
151146

152147
# set lockfile to avoid DB waits for this specific container

0 commit comments

Comments
 (0)