Skip to content

Rebase to 3.24 #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thespad merged 1 commit into from
Jul 6, 2026
Merged

Rebase to 3.24 #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

# set version label
ARG BUILD_DATE
Expand All @@ -21,27 +21,27 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
grep \
imagemagick \
jpegoptim \
php84-bcmath \
php84-dom \
php84-exif \
php84-gd \
php84-intl \
php84-ldap \
php84-mysqli \
php84-pdo_mysql \
php84-pdo_pgsql \
php84-pdo_sqlite \
php84-pecl-imagick \
php84-pecl-redis \
php84-pgsql \
php84-sodium \
php84-sqlite3 \
php84-tokenizer \
php85-bcmath \
php85-dom \
php85-exif \
php85-gd \
php85-intl \
php85-ldap \
php85-mysqli \
php85-pdo_mysql \
php85-pdo_pgsql \
php85-pdo_sqlite \
php85-pecl-imagick \
php85-pecl-redis \
php85-pgsql \
php85-sodium \
php85-sqlite3 \
php85-tokenizer \
postgresql16-client \
unzip && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
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 && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
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 && \
echo "**** install lychee ****" && \
if [ -z "${LYCHEE_VERSION}" ]; then \
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \
Expand Down
38 changes: 19 additions & 19 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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

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

# set version label
ARG BUILD_DATE
Expand All @@ -21,27 +21,27 @@ RUN --mount=type=bind,from=cosign-bin,source=/ko-app/cosign,target=/usr/local/bi
grep \
imagemagick \
jpegoptim \
php84-bcmath \
php84-dom \
php84-exif \
php84-gd \
php84-intl \
php84-ldap \
php84-mysqli \
php84-pdo_mysql \
php84-pdo_pgsql \
php84-pdo_sqlite \
php84-pecl-imagick \
php84-pecl-redis \
php84-pgsql \
php84-sodium \
php84-sqlite3 \
php84-tokenizer \
php85-bcmath \
php85-dom \
php85-exif \
php85-gd \
php85-intl \
php85-ldap \
php85-mysqli \
php85-pdo_mysql \
php85-pdo_pgsql \
php85-pdo_sqlite \
php85-pecl-imagick \
php85-pecl-redis \
php85-pgsql \
php85-sodium \
php85-sqlite3 \
php85-tokenizer \
postgresql16-client \
unzip && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
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 && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
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 && \
echo "**** install lychee ****" && \
if [ -z "${LYCHEE_VERSION}" ]; then \
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **05.07.26:** - Rebase to Alpine 3.24.
* **09.07.25:** - Add php84-ldap as dependency.
* **09.07.25:** - Rebase to Alpine 3.22.
* **03.12.24:** - Verify build artifacts with cosign.
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ init_diagram: |
"lychee:latest" <- Base Images
# changelog
changelogs:
- {date: "05.07.26:", desc: "Rebase to Alpine 3.24."}
- {date: "09.07.25:", desc: "Add php84-ldap as dependency."}
- {date: "09.07.25:", desc: "Rebase to Alpine 3.22."}
- {date: "03.12.24:", desc: "Verify build artifacts with cosign."}
Expand Down
4 changes: 2 additions & 2 deletions root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ if [[ ! -L /app/www/storage/logs ]]; then
fi

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

cd /app/www || exit 1

Expand Down