Skip to content

Commit deb1589

Browse files
thespadthespad
committed
Rebase to 3.24
1 parent ef292df commit deb1589

5 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎Dockerfile‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM ghcr.io/sigstore/cosign/cosign:latest AS cosign-bin
44

5-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
5+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24
66

77
# set version label
88
ARG BUILD_DATE
@@ -21,27 +21,27 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
2121
grep \
2222
imagemagick \
2323
jpegoptim \
24-
php84-bcmath \
25-
php84-dom \
26-
php84-exif \
27-
php84-gd \
28-
php84-intl \
29-
php84-ldap \
30-
php84-mysqli \
31-
php84-pdo_mysql \
32-
php84-pdo_pgsql \
33-
php84-pdo_sqlite \
34-
php84-pecl-imagick \
35-
php84-pecl-redis \
36-
php84-pgsql \
37-
php84-sodium \
38-
php84-sqlite3 \
39-
php84-tokenizer \
24+
php85-bcmath \
25+
php85-dom \
26+
php85-exif \
27+
php85-gd \
28+
php85-intl \
29+
php85-ldap \
30+
php85-mysqli \
31+
php85-pdo_mysql \
32+
php85-pdo_pgsql \
33+
php85-pdo_sqlite \
34+
php85-pecl-imagick \
35+
php85-pecl-redis \
36+
php85-pgsql \
37+
php85-sodium \
38+
php85-sqlite3 \
39+
php85-tokenizer \
4040
postgresql16-client \
4141
unzip && \
4242
echo "**** configure php-fpm to pass env vars ****" && \
43-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
44-
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 && \
43+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
44+
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 && \
4545
echo "**** install lychee ****" && \
4646
if [ -z "${LYCHEE_VERSION}" ]; then \
4747
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

‎Dockerfile.aarch64‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
FROM ghcr.io/sigstore/cosign/cosign:latest AS cosign-bin
44

5-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
5+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24
66

77
# set version label
88
ARG BUILD_DATE
@@ -21,27 +21,27 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
2121
grep \
2222
imagemagick \
2323
jpegoptim \
24-
php84-bcmath \
25-
php84-dom \
26-
php84-exif \
27-
php84-gd \
28-
php84-intl \
29-
php84-ldap \
30-
php84-mysqli \
31-
php84-pdo_mysql \
32-
php84-pdo_pgsql \
33-
php84-pdo_sqlite \
34-
php84-pecl-imagick \
35-
php84-pecl-redis \
36-
php84-pgsql \
37-
php84-sodium \
38-
php84-sqlite3 \
39-
php84-tokenizer \
24+
php85-bcmath \
25+
php85-dom \
26+
php85-exif \
27+
php85-gd \
28+
php85-intl \
29+
php85-ldap \
30+
php85-mysqli \
31+
php85-pdo_mysql \
32+
php85-pdo_pgsql \
33+
php85-pdo_sqlite \
34+
php85-pecl-imagick \
35+
php85-pecl-redis \
36+
php85-pgsql \
37+
php85-sodium \
38+
php85-sqlite3 \
39+
php85-tokenizer \
4040
postgresql16-client \
4141
unzip && \
4242
echo "**** configure php-fpm to pass env vars ****" && \
43-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
44-
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 && \
43+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
44+
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 && \
4545
echo "**** install lychee ****" && \
4646
if [ -z "${LYCHEE_VERSION}" ]; then \
4747
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

‎README.md‎

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

324324
## Versions
325325

326+
* **05.07.26:** - Rebase to Alpine 3.24.
326327
* **09.07.25:** - Add php84-ldap as dependency.
327328
* **09.07.25:** - Rebase to Alpine 3.22.
328329
* **03.12.24:** - Verify build artifacts with cosign.

‎readme-vars.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ init_diagram: |
114114
"lychee:latest" <- Base Images
115115
# changelog
116116
changelogs:
117+
- {date: "05.07.26:", desc: "Rebase to Alpine 3.24."}
117118
- {date: "09.07.25:", desc: "Add php84-ldap as dependency."}
118119
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}
119120
- {date: "03.12.24:", desc: "Verify build artifacts with cosign."}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ if [[ ! -L /app/www/storage/logs ]]; then
3030
fi
3131

3232
cp -n /defaults/user.ini /config/user.ini 2> >(grep -v 'cp: not replacing')
33-
rm -rf /etc/php84/conf.d/99-user.ini
34-
ln -s /config/user.ini /etc/php84/conf.d/99-user.ini
33+
rm -rf /etc/php85/conf.d/99-user.ini
34+
ln -s /config/user.ini /etc/php85/conf.d/99-user.ini
3535

3636
cd /app/www || exit 1
3737

0 commit comments

Comments
 (0)