Skip to content

Commit ba22acf

Browse files
committed
Rebase to Alpine 3.19
Signed-off-by: Eric Nemchik <[email protected]>
1 parent ca61451 commit ba22acf

File tree

3 files changed

+24
-23
lines changed

3 files changed

+24
-23
lines changed

Dockerfile

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -17,19 +17,19 @@ RUN \
1717
fontconfig \
1818
mariadb-client \
1919
memcached \
20-
php82-dom \
21-
php82-gd \
22-
php82-ldap \
23-
php82-mysqlnd \
24-
php82-pdo_mysql \
25-
php82-pecl-memcached \
26-
php82-tokenizer \
20+
php83-dom \
21+
php83-gd \
22+
php83-ldap \
23+
php83-mysqlnd \
24+
php83-pdo_mysql \
25+
php83-pecl-memcached \
26+
php83-tokenizer \
2727
qt5-qtbase \
2828
ttf-freefont && \
2929
echo "**** configure php-fpm to pass env vars ****" && \
30-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
31-
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
32-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
30+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
31+
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
32+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
3333
echo "**** fetch bookstack ****" && \
3434
mkdir -p\
3535
/app/www && \

Dockerfile.aarch64

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
44

55
# set version label
66
ARG BUILD_DATE
@@ -17,19 +17,19 @@ RUN \
1717
fontconfig \
1818
mariadb-client \
1919
memcached \
20-
php82-dom \
21-
php82-gd \
22-
php82-ldap \
23-
php82-mysqlnd \
24-
php82-pdo_mysql \
25-
php82-pecl-memcached \
26-
php82-tokenizer \
20+
php83-dom \
21+
php83-gd \
22+
php83-ldap \
23+
php83-mysqlnd \
24+
php83-pdo_mysql \
25+
php83-pecl-memcached \
26+
php83-tokenizer \
2727
qt5-qtbase \
2828
ttf-freefont && \
2929
echo "**** configure php-fpm to pass env vars ****" && \
30-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
31-
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
32-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \
30+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
31+
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
32+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
3333
echo "**** fetch bookstack ****" && \
3434
mkdir -p\
3535
/app/www && \

readme-vars.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ available_architectures:
2121
param_container_name: "{{ project_name }}"
2222
param_usage_include_vols: true
2323
param_volumes:
24-
- { vol_path: "/config", vol_host_path: "/path/to/data", desc: "this will store any uploaded data on the docker host" }
24+
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
2525
param_usage_include_env: true
2626
param_env_vars:
2727
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
@@ -113,6 +113,7 @@ app_setup_block: |
113113
114114
# changelog
115115
changelogs:
116+
- { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
116117
- { date: "31.10.23:", desc: "Further sanitize sed replace." }
117118
- { date: "07.06.23:", desc: "Add mariadb-client for bookstack-system-cli support." }
118119
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }

0 commit comments

Comments
 (0)