Skip to content

Commit c8f62a0

Browse files
committed
Rebase to 3.23
1 parent c6175d2 commit c8f62a0

4 files changed

Lines changed: 26 additions & 24 deletions

File tree

Dockerfile

Lines changed: 12 additions & 12 deletions
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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -12,18 +12,18 @@ LABEL maintainer="nemchik"
1212
RUN \
1313
echo "**** install runtime packages ****" && \
1414
apk add --no-cache \
15-
php84-gd \
16-
php84-intl \
17-
php84-ldap \
18-
php84-pdo_mysql \
19-
php84-pecl-redis \
20-
php84-tokenizer \
21-
php84-xmlreader \
22-
php84-xsl && \
15+
php85-gd \
16+
php85-intl \
17+
php85-ldap \
18+
php85-pdo_mysql \
19+
php85-pecl-redis \
20+
php85-tokenizer \
21+
php85-xmlreader \
22+
php85-xsl && \
2323
echo "**** configure php-fpm to pass env vars ****" && \
24-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
25-
if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
26-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
24+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
25+
if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
26+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
2727
echo "**** install kimai ****" && \
2828
mkdir -p\
2929
/app/www && \

Dockerfile.aarch64

Lines changed: 12 additions & 12 deletions
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.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -12,18 +12,18 @@ LABEL maintainer="nemchik"
1212
RUN \
1313
echo "**** install runtime packages ****" && \
1414
apk add --no-cache \
15-
php84-gd \
16-
php84-intl \
17-
php84-ldap \
18-
php84-pdo_mysql \
19-
php84-pecl-redis \
20-
php84-tokenizer \
21-
php84-xmlreader \
22-
php84-xsl && \
15+
php85-gd \
16+
php85-intl \
17+
php85-ldap \
18+
php85-pdo_mysql \
19+
php85-pecl-redis \
20+
php85-tokenizer \
21+
php85-xmlreader \
22+
php85-xsl && \
2323
echo "**** configure php-fpm to pass env vars ****" && \
24-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
25-
if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
26-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
24+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
25+
if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
26+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
2727
echo "**** install kimai ****" && \
2828
mkdir -p\
2929
/app/www && \

README.md

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

348348
## Versions
349349

350+
* **28.12.25:** - Rebase to Alpine 3.23.
350351
* **04.07.25:** - Rebase to Alpine 3.22.
351352
* **06.04.25:** - Rebase to Alpine 3.21.
352353
* **30.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ init_diagram: |
157157
"kimai:latest" <- Base Images
158158
# changelog
159159
changelogs:
160+
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
160161
- {date: "04.07.25:", desc: "Rebase to Alpine 3.22."}
161162
- {date: "06.04.25:", desc: "Rebase to Alpine 3.21."}
162163
- {date: "30.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}

0 commit comments

Comments
 (0)