Skip to content

Commit

Permalink
Merge pull request #14 from mhzawadi/dev
Browse files Browse the repository at this point in the history
Alpine 3.16
  • Loading branch information
mhzawadi authored May 25, 2022
2 parents 59cb4a9 + b44d430 commit 8295920
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.15
FROM alpine:3.16
MAINTAINER Matthew Horwood <matt@horwood.biz>

# Install required deb packages
RUN apk update && \
apk add gnupg nginx php7-fpm php7-common php7-iconv php7-json php7-gd \
php7-curl php7-xml php7-mysqli php7-imap php7-pdo php7-pdo_mysql \
php7-soap php7-xmlrpc php7-posix php7-mcrypt php7-gettext php7-ldap \
php7-ctype php7-dom php7-session php7-mbstring curl \
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 \
&& 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/php7/php.ini && \
cp /config/php_fpm_site.conf /etc/php7/php-fpm.d/www.conf; \
cp /config/php.ini /etc/php81/php.ini && \
cp /config/php_fpm_site.conf /etc/php81/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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ You can use following tags on Docker hub:
Run a MySQL database, dedicated to phpmyadmin

```bash
$ docker run --name phpmyadmin-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -v /my_dir/phpmyadmin:/var/lib/mysql -d mysql:5.7
docker run --name phpmyadmin-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -v /my_dir/phpmyadmin:/var/lib/mysql -d mysql:5.7
```

Here, we store data on the host system under `/my_dir/phpmyadmin` and use a specific root password.
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/php7/error.log
ln -s /dev/stdout /var/log/php81/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-fpm7
php-fpm81

exec "$@"

0 comments on commit 8295920

Please sign in to comment.