Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,10 @@ jobs:
run: sleep 60
- name: Check status
run: docker ps -a
- name: Logs
run: docker-compose logs
- name: Test
run: curl http://localhost:8080/ -L --fail -s | grep 'Sign in</button>' -q
run: curl http://localhost:8080/ -L --fail && curl http://localhost:8080/ -L --fail -s | grep 'Sign in</button>' -q
- name: Test Email
run: docker-compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' | grep 'Message successfully sent!' -q
test_prod:
Expand Down Expand Up @@ -143,8 +145,10 @@ jobs:
run: sleep 60
- name: Check status
run: docker ps -a
- name: Logs
run: docker-compose logs
- name: Test
run: curl http://localhost:8080/ -L --fail -s | grep 'Sign in</button>' -q
run: curl http://localhost:8080/ -L --fail && curl http://localhost:8080/ -L --fail -s | grep 'Sign in</button>' -q
- name: Test Email
run: docker-compose exec -T humhub php /var/www/localhost/htdocs/protected/yii test/email 'test@example.com' | grep 'Message successfully sent!' -q
push_ghcr:
Expand Down
100 changes: 49 additions & 51 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,28 @@ ARG BUILD_DEPS="\
ca-certificates \
nodejs \
npm \
php7 \
php7-ctype \
php7-curl \
php7-dom \
php7-exif \
php7-fileinfo \
php7-gd \
php7-iconv \
php7-intl \
php7-json \
php7-ldap \
php7-mbstring \
php7-openssl \
php7-pdo_mysql \
php7-phar \
php7-simplexml \
php7-tokenizer \
php7-xml \
php7-xmlreader \
php7-xmlwriter \
php7-zip \
php8 \
php8-ctype \
php8-curl \
php8-dom \
php8-exif \
php8-fileinfo \
php8-gd \
php8-iconv \
php8-intl \
php8-json \
php8-ldap \
php8-mbstring \
php8-openssl \
php8-pdo_mysql \
php8-phar \
php8-simplexml \
php8-tokenizer \
php8-xml \
php8-xmlreader \
php8-xmlwriter \
php8-zip \
composer \
tzdata \
"

Expand All @@ -33,38 +34,36 @@ ARG RUNTIME_DEPS="\
curl \
imagemagick \
libintl \
php7 \
php7-apcu \
php7-ctype \
php7-curl \
php7-dom \
php7-exif \
php7-fileinfo \
php7-fpm \
php7-gd \
php7-iconv \
php7-intl \
php7-json \
php7-ldap \
php7-mbstring \
php7-openssl \
php7-pdo_mysql \
php7-pecl-imagick \
php7-phar \
php7-session \
php7-simplexml \
php7-sqlite3 \
php7-xml \
php7-xmlreader \
php7-xmlwriter \
php7-zip \
php8 \
php8-apcu \
php8-ctype \
php8-curl \
php8-dom \
php8-exif \
php8-fileinfo \
php8-fpm \
php8-gd \
php8-iconv \
php8-intl \
php8-json \
php8-ldap \
php8-mbstring \
php8-openssl \
php8-pdo_mysql \
php8-pecl-imagick \
php8-phar \
php8-session \
php8-simplexml \
php8-sqlite3 \
php8-xml \
php8-xmlreader \
php8-xmlwriter \
php8-zip \
sqlite \
supervisor \
tzdata \
"

FROM composer:2.5.5 as builder-composer

FROM docker.io/library/alpine:3.15.4 as builder

ARG HUMHUB_VERSION
Expand All @@ -73,9 +72,6 @@ ARG BUILD_DEPS
RUN apk add --no-cache --update $BUILD_DEPS && \
rm -rf /var/cache/apk/*

COPY --from=builder-composer /usr/bin/composer /usr/bin/composer
RUN chmod +x /usr/bin/composer

WORKDIR /usr/src/
ADD https://github.com/humhub/humhub/archive/v${HUMHUB_VERSION}.tar.gz /usr/src/
RUN tar xzf v${HUMHUB_VERSION}.tar.gz && \
Expand All @@ -86,6 +82,7 @@ WORKDIR /usr/src/humhub

RUN composer config --no-plugins allow-plugins.yiisoft/yii2-composer true && \
composer install --no-ansi --no-dev --no-interaction --no-progress --no-scripts --optimize-autoloader && \
ln -s /usr/bin/php8 /usr/bin/php && \
chmod +x protected/yii && \
chmod +x protected/yii.bat && \
npm install grunt && \
Expand All @@ -110,6 +107,7 @@ LABEL name="HumHub" version=${HUMHUB_VERSION} variant="base" \

RUN apk add --no-cache --update $RUNTIME_DEPS && \
apk add --no-cache --virtual temp_pkgs gettext && \
ln -s /usr/bin/php8 /usr/bin/php && \
cp /usr/bin/envsubst /usr/local/bin/envsubst && \
apk del temp_pkgs && \
rm -rf /var/cache/apk/*
Expand Down
2 changes: 1 addition & 1 deletion base/etc/supervisord.conf.d/php-fpm.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[program:php-fpm]
command=/usr/sbin/php-fpm7 --fpm-config /etc/php-fpm.d/pool.conf -O -F
command=/usr/sbin/php-fpm8 --fpm-config /etc/php-fpm.d/pool.conf -O -F
user=root
autostart = true
stdout_logfile=/proc/self/fd/2
Expand Down
Loading