File tree Expand file tree Collapse file tree 14 files changed +65
-57
lines changed
root/etc/s6-overlay/s6-rc.d Expand file tree Collapse file tree 14 files changed +65
-57
lines changed Original file line number Diff line number Diff line change 1
- FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
1
+ # syntax=docker/dockerfile:1
2
+
3
+ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
2
4
3
5
# set version label
4
6
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
18
20
apk add --no-cache \
19
21
fontconfig \
20
22
memcached \
21
- php8 -ctype \
22
- php8 -curl \
23
- php8 -dom \
24
- php8 -gd \
25
- php8 -ldap \
26
- php8 -mbstring \
27
- php8 -mysqlnd \
28
- php8 -openssl \
29
- php8 -pdo_mysql \
30
- php8 -pecl-memcached \
31
- php8 -phar \
32
- php8 -simplexml \
33
- php8 -tokenizer \
23
+ php81 -ctype \
24
+ php81 -curl \
25
+ php81 -dom \
26
+ php81 -gd \
27
+ php81 -ldap \
28
+ php81 -mbstring \
29
+ php81 -mysqlnd \
30
+ php81 -openssl \
31
+ php81 -pdo_mysql \
32
+ php81 -pecl-memcached \
33
+ php81 -phar \
34
+ php81 -simplexml \
35
+ php81 -tokenizer \
34
36
qt5-qtbase \
35
- tar \
36
37
ttf-freefont && \
37
38
apk add --no-cache \
38
39
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
39
40
wkhtmltopdf && \
40
41
echo "**** configure php-fpm to pass env vars ****" && \
41
- sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8 /php-fpm.d/www.conf && \
42
- grep -qxF 'clear_env = no' /etc/php8 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8 /php-fpm.d/www.conf && \
43
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8 /php-fpm.conf && \
42
+ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81 /php-fpm.d/www.conf && \
43
+ grep -qxF 'clear_env = no' /etc/php81 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81 /php-fpm.d/www.conf && \
44
+ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81 /php-fpm.conf && \
44
45
echo "**** fetch bookstack ****" && \
45
46
mkdir -p\
46
47
/app/www && \
Original file line number Diff line number Diff line change 1
- FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
1
+ # syntax=docker/dockerfile:1
2
+
3
+ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
2
4
3
5
# set version label
4
6
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
18
20
apk add --no-cache \
19
21
fontconfig \
20
22
memcached \
21
- php8 -ctype \
22
- php8 -curl \
23
- php8 -dom \
24
- php8 -gd \
25
- php8 -ldap \
26
- php8 -mbstring \
27
- php8 -mysqlnd \
28
- php8 -openssl \
29
- php8 -pdo_mysql \
30
- php8 -pecl-memcached \
31
- php8 -phar \
32
- php8 -simplexml \
33
- php8 -tokenizer \
23
+ php81 -ctype \
24
+ php81 -curl \
25
+ php81 -dom \
26
+ php81 -gd \
27
+ php81 -ldap \
28
+ php81 -mbstring \
29
+ php81 -mysqlnd \
30
+ php81 -openssl \
31
+ php81 -pdo_mysql \
32
+ php81 -pecl-memcached \
33
+ php81 -phar \
34
+ php81 -simplexml \
35
+ php81 -tokenizer \
34
36
qt5-qtbase \
35
- tar \
36
37
ttf-freefont && \
37
38
apk add --no-cache \
38
39
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
39
40
wkhtmltopdf && \
40
41
echo "**** configure php-fpm to pass env vars ****" && \
41
- sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8 /php-fpm.d/www.conf && \
42
- grep -qxF 'clear_env = no' /etc/php8 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8 /php-fpm.d/www.conf && \
43
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8 /php-fpm.conf && \
42
+ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81 /php-fpm.d/www.conf && \
43
+ grep -qxF 'clear_env = no' /etc/php81 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81 /php-fpm.d/www.conf && \
44
+ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81 /php-fpm.conf && \
44
45
echo "**** fetch bookstack ****" && \
45
46
mkdir -p\
46
47
/app/www && \
Original file line number Diff line number Diff line change 1
- FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
1
+ # syntax=docker/dockerfile:1
2
+
3
+ FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
2
4
3
5
# set version label
4
6
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
18
20
apk add --no-cache \
19
21
fontconfig \
20
22
memcached \
21
- php8 -ctype \
22
- php8 -curl \
23
- php8 -dom \
24
- php8 -gd \
25
- php8 -ldap \
26
- php8 -mbstring \
27
- php8 -mysqlnd \
28
- php8 -openssl \
29
- php8 -pdo_mysql \
30
- php8 -pecl-memcached \
31
- php8 -phar \
32
- php8 -simplexml \
33
- php8 -tokenizer \
23
+ php81 -ctype \
24
+ php81 -curl \
25
+ php81 -dom \
26
+ php81 -gd \
27
+ php81 -ldap \
28
+ php81 -mbstring \
29
+ php81 -mysqlnd \
30
+ php81 -openssl \
31
+ php81 -pdo_mysql \
32
+ php81 -pecl-memcached \
33
+ php81 -phar \
34
+ php81 -simplexml \
35
+ php81 -tokenizer \
34
36
qt5-qtbase \
35
- tar \
36
37
ttf-freefont && \
37
38
apk add --no-cache \
38
39
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
39
40
wkhtmltopdf && \
40
41
echo "**** configure php-fpm to pass env vars ****" && \
41
- sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php8 /php-fpm.d/www.conf && \
42
- grep -qxF 'clear_env = no' /etc/php8 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php8 /php-fpm.d/www.conf && \
43
- echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php8 /php-fpm.conf && \
42
+ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81 /php-fpm.d/www.conf && \
43
+ grep -qxF 'clear_env = no' /etc/php81 /php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81 /php-fpm.d/www.conf && \
44
+ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81 /php-fpm.conf && \
44
45
echo "**** fetch bookstack ****" && \
45
46
mkdir -p\
46
47
/app/www && \
Original file line number Diff line number Diff line change @@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
276
276
277
277
## Versions
278
278
279
+ * ** 20.08.22:** - Rebase to alpine 3.17 with php8.1.
279
280
* ** 16.01.23:** - Wrap ` .env ` values in quotes.
280
281
* ** 05.01.23:** - Fix db password setting (sed escape ` & ` ).
281
282
* ** 21.12.22:** - Update db info in .env file when env vars are updated.
Original file line number Diff line number Diff line change @@ -104,6 +104,7 @@ app_setup_block: |
104
104
105
105
# changelog
106
106
changelogs :
107
+ - { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." }
107
108
- { date: "16.01.23:", desc: "Wrap `.env` values in quotes." }
108
109
- { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." }
109
110
- { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." }
Original file line number Diff line number Diff line change 4
4
if [ -d /app/www-tmp ]; then
5
5
echo "New container detected. Setting up app folder and fixing permissions."
6
6
mv /app/www-tmp /app/www
7
- chown -R abc:abc /app/www
7
+ lsiown -R abc:abc /app/www
8
8
fi
9
9
10
10
# create directory structure
@@ -145,8 +145,8 @@ if [ -z "${CI_RUN+x}" ]; then
145
145
php /app/www/artisan migrate --force
146
146
fi
147
147
148
- # set permissions
149
- chown -R abc:abc \
148
+ # permissions
149
+ lsiown -R abc:abc \
150
150
/config
151
151
152
152
# set lockfile to avoid DB waits for this specific container
Original file line number Diff line number Diff line change
1
+ oneshot
Original file line number Diff line number Diff line change
1
+ /etc/s6-overlay/s6-rc.d/init-bookstack-config/run
You can’t perform that action at this time.
0 commit comments