From 04d465a11d4ef895ad305527e53166513002c81f Mon Sep 17 00:00:00 2001 From: xpk Date: Tue, 24 May 2022 23:36:14 +0800 Subject: [PATCH] UPD: upgraded to alpine 3.16 --- alpine/dante/Dockerfile | 2 +- alpine/dante/restart.sh | 2 +- alpine/fpmredis/Dockerfile | 10 +++++----- alpine/fpmredis/Dockerfile-php81 | 9 +++++++++ alpine/fpmredis/supervisord.conf | 2 +- alpine/gcloudcli/Dockerfile | 2 +- alpine/gcloudcli/README.md | 4 ++++ alpine/pma/Dockerfile | 6 +++--- alpine/pma/run.ini | 2 +- alpine/redis/Dockerfile | 2 +- 10 files changed, 27 insertions(+), 14 deletions(-) create mode 100644 alpine/fpmredis/Dockerfile-php81 diff --git a/alpine/dante/Dockerfile b/alpine/dante/Dockerfile index 0662219..80e04c4 100644 --- a/alpine/dante/Dockerfile +++ b/alpine/dante/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.16 LABEL description="Dante socks5 server" LABEL maintainer="racken@one27.cf" ENV container docker diff --git a/alpine/dante/restart.sh b/alpine/dante/restart.sh index 6b63e5d..9ee600a 100755 --- a/alpine/dante/restart.sh +++ b/alpine/dante/restart.sh @@ -1,2 +1,2 @@ -docker rm -f privoxy +docker rm -f sockd ./start.sh diff --git a/alpine/fpmredis/Dockerfile b/alpine/fpmredis/Dockerfile index 5917987..19421c0 100644 --- a/alpine/fpmredis/Dockerfile +++ b/alpine/fpmredis/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:latest +FROM alpine:3.16 ENV container docker -RUN apk update; apk upgrade; apk add php8-gd php8-session php8-json php8-fpm php8-mysqlnd php8-mysqli php8-mbstring php8-xml php8-redis php8-curl php8-gmp bash php8-pdo_mysql php8-zip php8-dom php8-xmlwriter php8-xmlreader php8-ctype php8-simplexml php8-intl php8-iconv redis supervisor php8-opcache php8-posix php8-fileinfo php8-pecl-imagick php8-bcmath php8-pcntl php8-cli +RUN apk update; apk upgrade; apk add php81-gd php81-session php81-json php81-fpm php81-mysqlnd php81-mysqli php81-mbstring php81-xml php81-redis php81-curl php81-gmp bash php81-pdo_mysql php81-zip php81-dom php81-xmlwriter php81-xmlreader php81-ctype php81-simplexml php81-intl php81-iconv redis supervisor php81-opcache php81-posix php81-fileinfo php81-pecl-imagick php81-bcmath php81-pcntl php81-cli COPY supervisord.conf /etc/supervisord.conf -COPY fpm-www.conf /etc/php8/php-fpm.d/www.conf -RUN sed -i -e 's/^disable_functions.*/disable_functions=exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,eval,base64_decode/g' -e 's/^expose_php.*/expose_php=off/g' -e 's/^memory_limit.*/memory_limit=512M/g' -e 's/^session.save_handler.*/session.save_handler=redis/g' /etc/php8/php.ini -RUN echo 'session.save_path = "tcp://192.168.86.212:6379"' >> /etc/php8/php.ini +COPY fpm-www.conf /etc/php81/php-fpm.d/www.conf +RUN sed -i -e 's/^disable_functions.*/disable_functions=exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,eval,base64_decode/g' -e 's/^expose_php.*/expose_php=off/g' -e 's/^memory_limit.*/memory_limit=512M/g' -e 's/^session.save_handler.*/session.save_handler=redis/g' /etc/php81/php.ini +RUN echo 'session.save_path = "tcp://192.168.86.212:6379"' >> /etc/php81/php.ini EXPOSE 9000 CMD ["/usr/bin/supervisord", "-n"] diff --git a/alpine/fpmredis/Dockerfile-php81 b/alpine/fpmredis/Dockerfile-php81 new file mode 100644 index 0000000..19421c0 --- /dev/null +++ b/alpine/fpmredis/Dockerfile-php81 @@ -0,0 +1,9 @@ +FROM alpine:3.16 +ENV container docker +RUN apk update; apk upgrade; apk add php81-gd php81-session php81-json php81-fpm php81-mysqlnd php81-mysqli php81-mbstring php81-xml php81-redis php81-curl php81-gmp bash php81-pdo_mysql php81-zip php81-dom php81-xmlwriter php81-xmlreader php81-ctype php81-simplexml php81-intl php81-iconv redis supervisor php81-opcache php81-posix php81-fileinfo php81-pecl-imagick php81-bcmath php81-pcntl php81-cli +COPY supervisord.conf /etc/supervisord.conf +COPY fpm-www.conf /etc/php81/php-fpm.d/www.conf +RUN sed -i -e 's/^disable_functions.*/disable_functions=exec,passthru,shell_exec,system,proc_open,popen,curl_exec,curl_multi_exec,eval,base64_decode/g' -e 's/^expose_php.*/expose_php=off/g' -e 's/^memory_limit.*/memory_limit=512M/g' -e 's/^session.save_handler.*/session.save_handler=redis/g' /etc/php81/php.ini +RUN echo 'session.save_path = "tcp://192.168.86.212:6379"' >> /etc/php81/php.ini +EXPOSE 9000 +CMD ["/usr/bin/supervisord", "-n"] diff --git a/alpine/fpmredis/supervisord.conf b/alpine/fpmredis/supervisord.conf index 4158dd3..a042e93 100644 --- a/alpine/fpmredis/supervisord.conf +++ b/alpine/fpmredis/supervisord.conf @@ -19,6 +19,6 @@ stderr_logfile = /var/log/supervisord-redis.err stdout_logfile = /var/log/supervisord-redis.log [program:phpfpm] -command=/usr/sbin/php-fpm8 -c /etc/php8/php-fpm.conf -F +command=/usr/sbin/php-fpm81 -c /etc/php81/php-fpm.conf -F stderr_logfile = /var/log/supervisord-fpm.err stdout_logfile = /var/log/supervisord-fpm.log diff --git a/alpine/gcloudcli/Dockerfile b/alpine/gcloudcli/Dockerfile index 39a4e39..c4eab4a 100644 --- a/alpine/gcloudcli/Dockerfile +++ b/alpine/gcloudcli/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine +FROM alpine:3.16 ENV container docker RUN apk update; apk upgrade; apk add jq bash wget curl python3 sqlite RUN wget -q -O- https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-368.0.0-linux-x86_64.tar.gz | tar zxf - diff --git a/alpine/gcloudcli/README.md b/alpine/gcloudcli/README.md index 1681e0a..72bae28 100644 --- a/alpine/gcloudcli/README.md +++ b/alpine/gcloudcli/README.md @@ -1,3 +1,7 @@ +# notes +There is no need to build your own image. Use the ones on docker hub. e.g. google/cloud-sdk:alpine +See https://hub.docker.com/r/google/cloud-sdk/ + # usage gcloud init diff --git a/alpine/pma/Dockerfile b/alpine/pma/Dockerfile index 9feadbe..1e3e176 100644 --- a/alpine/pma/Dockerfile +++ b/alpine/pma/Dockerfile @@ -1,11 +1,11 @@ -FROM alpine:latest +FROM alpine:3.16 LABEL description="phpmyadmin on alpine" LABEL maintainer="racken@one27.cf" ENV container docker -RUN apk update; apk add bash tini php8-pdo_mysql php8-fpm nginx php8-session supervisor unzip php8-iconv php8-mysqli php8-xml php8-mbstring +RUN apk update; apk add bash tini php81-pdo_mysql php81-fpm nginx php81-session supervisor unzip php81-iconv php81-mysqli php81-xml php81-mbstring RUN mkdir -p /var/www/html /etc/supervisor.d COPY nginx-default.conf /etc/nginx/http.d/default.conf -RUN wget -O /tmp/pma.zip https://files.phpmyadmin.net/phpMyAdmin/5.1.1/phpMyAdmin-5.1.1-all-languages.zip +RUN wget -O /tmp/pma.zip https://files.phpmyadmin.net/phpMyAdmin/5.2.0/phpMyAdmin-5.2.0-all-languages.zip RUN unzip -qd /var/www/html /tmp/pma.zip; mv /var/www/html/phpMyAdmin* /var/www/html/pma; rm -f /tmp/pma.zip COPY config.inc.php /var/www/html/pma/config.inc.php RUN mkdir -p /var/www/html/pma/tmp/; chmod 777 /var/www/html/pma/tmp/ diff --git a/alpine/pma/run.ini b/alpine/pma/run.ini index 6dd7f83..2111e9d 100644 --- a/alpine/pma/run.ini +++ b/alpine/pma/run.ini @@ -4,7 +4,7 @@ autostart=true autorestart=true [program:phpfpm] -command=/usr/sbin/php-fpm8 -F +command=/usr/sbin/php-fpm81 -F autostart=true autorestart=true diff --git a/alpine/redis/Dockerfile b/alpine/redis/Dockerfile index 0cafe87..1bfa435 100644 --- a/alpine/redis/Dockerfile +++ b/alpine/redis/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.16 LABEL description="Redis for use with gitea" LABEL maintainer="racken@one27.cf" ENV container docker