Skip to content

Commit ebeadd3

Browse files
committed
Rebase to alpine 3.17 with php8.1
1 parent 966414b commit ebeadd3

File tree

14 files changed

+65
-57
lines changed

14 files changed

+65
-57
lines changed

Dockerfile

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
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
24

35
# set version label
46
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
1820
apk add --no-cache \
1921
fontconfig \
2022
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 \
3436
qt5-qtbase \
35-
tar \
3637
ttf-freefont && \
3738
apk add --no-cache \
3839
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
3940
wkhtmltopdf && \
4041
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 && \
4445
echo "**** fetch bookstack ****" && \
4546
mkdir -p\
4647
/app/www && \

Dockerfile.aarch64

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
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
24

35
# set version label
46
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
1820
apk add --no-cache \
1921
fontconfig \
2022
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 \
3436
qt5-qtbase \
35-
tar \
3637
ttf-freefont && \
3738
apk add --no-cache \
3839
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
3940
wkhtmltopdf && \
4041
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 && \
4445
echo "**** fetch bookstack ****" && \
4546
mkdir -p\
4647
/app/www && \

Dockerfile.armhf

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
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
24

35
# set version label
46
ARG BUILD_DATE
@@ -18,29 +20,28 @@ RUN \
1820
apk add --no-cache \
1921
fontconfig \
2022
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 \
3436
qt5-qtbase \
35-
tar \
3637
ttf-freefont && \
3738
apk add --no-cache \
3839
--repository=http://dl-cdn.alpinelinux.org/alpine/v3.14/community \
3940
wkhtmltopdf && \
4041
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 && \
4445
echo "**** fetch bookstack ****" && \
4546
mkdir -p\
4647
/app/www && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
276276

277277
## Versions
278278

279+
* **20.08.22:** - Rebase to alpine 3.17 with php8.1.
279280
* **16.01.23:** - Wrap `.env` values in quotes.
280281
* **05.01.23:** - Fix db password setting (sed escape `&`).
281282
* **21.12.22:** - Update db info in .env file when env vars are updated.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ app_setup_block: |
104104
105105
# changelog
106106
changelogs:
107+
- { date: "20.08.22:", desc: "Rebase to alpine 3.17 with php8.1." }
107108
- { date: "16.01.23:", desc: "Wrap `.env` values in quotes." }
108109
- { date: "05.01.23:", desc: "Fix db password setting (sed escape `&`)." }
109110
- { date: "21.12.22:", desc: "Update db info in .env file when env vars are updated." }

root/etc/s6-overlay/s6-rc.d/init-bookstack-config/dependencies.d/init-nginx-end

Whitespace-only changes.

root/etc/cont-init.d/50-config renamed to root/etc/s6-overlay/s6-rc.d/init-bookstack-config/run

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
if [ -d /app/www-tmp ]; then
55
echo "New container detected. Setting up app folder and fixing permissions."
66
mv /app/www-tmp /app/www
7-
chown -R abc:abc /app/www
7+
lsiown -R abc:abc /app/www
88
fi
99

1010
# create directory structure
@@ -145,8 +145,8 @@ if [ -z "${CI_RUN+x}" ]; then
145145
php /app/www/artisan migrate --force
146146
fi
147147

148-
# set permissions
149-
chown -R abc:abc \
148+
# permissions
149+
lsiown -R abc:abc \
150150
/config
151151

152152
# set lockfile to avoid DB waits for this specific container
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
oneshot
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/etc/s6-overlay/s6-rc.d/init-bookstack-config/run

root/etc/s6-overlay/s6-rc.d/svc-memcached/dependencies.d/init-services

Whitespace-only changes.

0 commit comments

Comments
 (0)