LAB-linuxserver/docker-lychee
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-lychee.git synced 2026-02-05 02:49:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase to Alpine 3.19

Browse Source 
Signed-off-by: Eric Nemchik <eric@nemchik.com>
This commit is contained in:
Eric Nemchik 2023-12-23 18:12:14 -06:00
parent 0e341f6967
commit a1805b1cc0
No known key found for this signature in database
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
# set version label
ARG BUILD_DATE
@ -22,22 +22,22 @@ RUN \
grep \
imagemagick \
jpegoptim \
php82-bcmath \
php82-dom \
php82-exif \
php82-gd \
php82-intl \
php82-pdo_mysql \
php82-pdo_pgsql \
php82-pdo_sqlite \
php82-pecl-imagick \
php82-pecl-redis \
php82-sqlite3 \
php82-tokenizer \
php83-bcmath \
php83-dom \
php83-exif \
php83-gd \
php83-intl \
php83-pdo_mysql \
php83-pdo_pgsql \
php83-pdo_sqlite \
php83-pecl-imagick \
php83-pecl-redis \
php83-sqlite3 \
php83-tokenizer \
postgresql15-client && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
echo "**** install lychee ****" && \
if [ -z "${LYCHEE_VERSION}" ]; then \
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

30
Dockerfile.aarch64
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19
# set version label
ARG BUILD_DATE
@ -22,22 +22,22 @@ RUN \
grep \
imagemagick \
jpegoptim \
php82-bcmath \
php82-dom \
php82-exif \
php82-gd \
php82-intl \
php82-pdo_mysql \
php82-pdo_pgsql \
php82-pdo_sqlite \
php82-pecl-imagick \
php82-pecl-redis \
php82-sqlite3 \
php82-tokenizer \
php83-bcmath \
php83-dom \
php83-exif \
php83-gd \
php83-intl \
php83-pdo_mysql \
php83-pdo_pgsql \
php83-pdo_sqlite \
php83-pecl-imagick \
php83-pecl-redis \
php83-sqlite3 \
php83-tokenizer \
postgresql15-client && \
echo "**** configure php-fpm to pass env vars ****" && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \
echo "**** install lychee ****" && \
if [ -z "${LYCHEE_VERSION}" ]; then \
LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \

1
readme-vars.yml
View File

@ -67,6 +67,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3."}
- { date: "27.12.23:", desc: "Update image to support v5." }
- { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf. Build npm dependencies into image." }
- { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }

4
root/etc/s6-overlay/s6-rc.d/init-lychee-config/run
View File

@ -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/php82/conf.d/99-user.ini
ln -s /config/user.ini /etc/php82/conf.d/99-user.ini
rm -rf /etc/php83/conf.d/99-user.ini
ln -s /config/user.ini /etc/php83/conf.d/99-user.ini
cd /app/www || exit 1