Skip to content

Commit

Permalink
Merge pull request #25 from mhzawadi/dev
Browse files Browse the repository at this point in the history
Alpine 3.19 & PHP8.2
  • Loading branch information
mhzawadi authored Jan 29, 2024
2 parents f3d6d69 + a2ee60f commit 41e2d36
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ MAINTAINER Matthew Horwood <[email protected]>

# Install required deb packages
RUN apk update && \
apk add gnupg nginx php81-fpm php81-common php81-iconv php81-json php81-gd \
php81-curl php81-xml php81-mysqli php81-imap php81-pdo php81-pdo_mysql \
php81-soap php81-posix php81-gettext php81-ldap \
php81-ctype php81-dom php81-session php81-mbstring curl \
apk add gnupg nginx php82-fpm php82-common php82-iconv php82-json php82-gd \
php82-curl php82-xml php82-mysqli php82-imap php82-pdo php82-pdo_mysql \
php82-soap php82-posix php82-gettext php82-ldap \
php82-ctype php82-dom php82-session php82-mbstring curl \
&& mkdir -p /var/www/html/ \
&& mkdir -p /run/nginx \
&& rm -f /var/cache/apk/*;
Expand Down Expand Up @@ -44,8 +44,8 @@ RUN set -ex; \
sed -i "s@'configFile' => ROOT_PATH . 'config.inc.php',@'configFile' => '/etc/phpmyadmin/config.inc.php',@" /usr/src/phpmyadmin/libraries/vendor_config.php; \
cp -R /usr/src/phpmyadmin/* /var/www/html/; \
cp /config/config.inc.php /etc/phpmyadmin/config.inc.php && \
cp /config/php.ini /etc/php81/php.ini && \
cp /config/php_fpm_site.conf /etc/php81/php-fpm.d/www.conf; \
cp /config/php.ini /etc/php82/php.ini && \
cp /config/php_fpm_site.conf /etc/php82/php-fpm.d/www.conf; \
chown -R nobody:nginx /var/www/html /sessions; \
cp /config/nginx_site.conf /etc/nginx/http.d/default.conf; \
cp /config/healthcheck.php /var/www/html/;
Expand Down
4 changes: 2 additions & 2 deletions setup/start.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

ln -s /dev/stdout /var/log/php81/error.log
ln -s /dev/stdout /var/log/php82/error.log
ln -s /dev/stdout /var/log/nginx/access.log
ln -s /dev/stdout /var/log/nginx/error.log

Expand All @@ -15,6 +15,6 @@ if [ ! -f /etc/phpmyadmin/config.user.inc.php ]; then
touch /etc/phpmyadmin/config.user.inc.php
fi

php-fpm81
php-fpm82

exec "$@"

0 comments on commit 41e2d36

Please sign in to comment.