Skip to content
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

update alpine 3.19.4 #365

Merged
merged 1 commit into from
Nov 3, 2024
Merged

update alpine 3.19.4 #365

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
100 changes: 50 additions & 50 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@ ARG BUILD_DEPS="\
ca-certificates \
nodejs \
npm \
php81 \
php81-ctype \
php81-curl \
php81-dom \
php81-exif \
php81-fileinfo \
php81-gd \
php81-iconv \
php81-intl \
php81-json \
php81-ldap \
php81-mbstring \
php81-openssl \
php81-pdo_mysql \
php81-phar \
php81-simplexml \
php81-tokenizer \
php81-xml \
php81-xmlreader \
php81-xmlwriter \
php81-zip \
php82 \
php82-ctype \
php82-curl \
php82-dom \
php82-exif \
php82-fileinfo \
php82-gd \
php82-iconv \
php82-intl \
php82-json \
php82-ldap \
php82-mbstring \
php82-openssl \
php82-pdo_mysql \
php82-phar \
php82-simplexml \
php82-tokenizer \
php82-xml \
php82-xmlreader \
php82-xmlwriter \
php82-zip \
composer \
tzdata \
"
Expand All @@ -34,39 +34,39 @@ ARG RUNTIME_DEPS="\
curl \
imagemagick \
libintl \
php81 \
php81-apcu \
php81-bcmath \
php81-ctype \
php81-curl \
php81-dom \
php81-exif \
php81-fileinfo \
php81-fpm \
php81-gd \
php81-gmp \
php81-iconv \
php81-intl \
php81-json \
php81-ldap \
php81-mbstring \
php81-openssl \
php81-pdo_mysql \
php81-pecl-imagick \
php81-phar \
php81-session \
php81-simplexml \
php81-sqlite3 \
php81-xml \
php81-xmlreader \
php81-xmlwriter \
php81-zip \
php82 \
php82-apcu \
php82-bcmath \
php82-ctype \
php82-curl \
php82-dom \
php82-exif \
php82-fileinfo \
php82-fpm \
php82-gd \
php82-gmp \
php82-iconv \
php82-intl \
php82-json \
php82-ldap \
php82-mbstring \
php82-openssl \
php82-pdo_mysql \
php82-pecl-imagick \
php82-phar \
php82-session \
php82-simplexml \
php82-sqlite3 \
php82-xml \
php82-xmlreader \
php82-xmlwriter \
php82-zip \
sqlite \
supervisor \
tzdata \
"

FROM docker.io/library/alpine:3.18.4 as builder
FROM docker.io/library/alpine:3.19.4 as builder

ARG HUMHUB_VERSION
ARG BUILD_DEPS
Expand All @@ -91,7 +91,7 @@ RUN composer config --no-plugins allow-plugins.yiisoft/yii2-composer true && \
grunt build-assets && \
rm -rf ./node_modules

FROM docker.io/library/alpine:3.18.4 as base
FROM docker.io/library/alpine:3.19.4 as base

ARG HUMHUB_VERSION
ARG RUNTIME_DEPS
Expand Down
0 base/etc/php81/conf.d/99-custom.ini → base/etc/php82/conf.d/99-custom.ini
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion base/etc/supervisord.conf.d/php-fpm.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:php-fpm]
command=/usr/sbin/php-fpm81 --fpm-config /etc/php-fpm.d/pool.conf -O -F
command=/usr/sbin/php-fpm82 --fpm-config /etc/php-fpm.d/pool.conf -O -F
user=root
autostart = true
stdout_logfile=/proc/self/fd/2
Expand Down
2 changes: 1 addition & 1 deletion nginx/docker-entrypoint.d/70-nginx-allowedips.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

# Reverseproxy
HUMHUB_REVERSEPROXY_WHITELIST=${HUMHUB_REVERSEPROXY_WHITELIST:-"127.0.0.1"}
HUMHUB_REVERSEPROXY_WHITELIST=${HUMHUB_REVERSEPROXY_WHITELIST:-"127.0.0.1 ::1"}

echo "Setting HUMHUB_REVERSEPROXY_WHITELIST"
reverseproxyips=$(echo "$HUMHUB_REVERSEPROXY_WHITELIST" | tr ";" "\n")
Expand Down
Loading