From 14c08dd54e6353ed1dfe6d56d48060754880d95b Mon Sep 17 00:00:00 2001 From: "Stanislav N. aka pztrn" Date: Wed, 29 Jun 2022 19:39:30 +0500 Subject: [PATCH] Switch to mirrorred images for Drone and Docker, update to PHP 8. --- .drone.yml | 4 ++-- Dockerfile | 4 ++-- configuration/php7/php-fpm.conf | 7 ------- configuration/php8/php-fpm.conf | 7 +++++++ configuration/{php7 => php8}/php.ini | 0 5 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 configuration/php7/php-fpm.conf create mode 100644 configuration/php8/php-fpm.conf rename configuration/{php7 => php8}/php.ini (100%) diff --git a/.drone.yml b/.drone.yml index f2091bd..05b2e15 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,11 +5,11 @@ name: build steps: - name: docker - image: plugins/docker + image: code.pztrn.name/containers/mirror/plugins/docker:20.13.0 settings: registry: code.pztrn.name username: drone password: from_secret: drone_secret - repo: code.pztrn.name/containers/npf-docker + repo: code.pztrn.name/containers/npf auto_tag: true diff --git a/Dockerfile b/Dockerfile index 5fcac4b..1610288 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.14 +FROM code.pztrn.name/containers/mirror/alpine:3.16.0 -RUN apk add --no-cache nginx php7-bcmath php7-bz2 php7-common php7-ctype php7-curl php7-dba php7-dom php7-embed php7-enchant php7-exif php7-ffi php7-fileinfo php7-fpm php7-ftp php7-gd php7-gettext php7-gmp php7-iconv php7-imap php7-intl php7-json php7-ldap php7-mbstring php7-mysqlnd php7-odbc php7-opcache php7-openssl php7-pcntl php7-pdo php7-pdo_dblib php7-pdo_mysql php7-pdo_odbc php7-pdo_pgsql php7-pdo_sqlite php7-pear php7-pgsql php7-phar php7-posix php7-pspell php7-session php7-shmop php7-simplexml php7-snmp php7-soap php7-sockets php7-sodium php7-sqlite3 php7-sysvmsg php7-sysvshm php7-tidy php7-tokenizer php7-xml php7-xmlreader php7-xmlrpc php7-xmlwriter php7-xsl php7-zip s6 +RUN apk add --no-cache nginx php8-bcmath php8-bz2 php8-common php8-ctype php8-curl php8-dba php8-dom php8-embed php8-enchant php8-exif php8-ffi php8-fileinfo php8-fpm php8-ftp php8-gd php8-gettext php8-gmp php8-iconv php8-imap php8-intl php8-json php8-ldap php8-mbstring php8-mysqlnd php8-odbc php8-opcache php8-openssl php8-pcntl php8-pdo php8-pdo_dblib php8-pdo_mysql php8-pdo_odbc php8-pdo_pgsql php8-pdo_sqlite php8-pear php8-pgsql php8-phar php8-posix php8-pspell php8-session php8-shmop php8-simplexml php8-snmp php8-soap php8-sockets php8-sodium php8-sqlite3 php8-sysvmsg php8-sysvshm php8-tidy php8-tokenizer php8-xml php8-xmlreader php8-xmlrpc php8-xmlwriter php8-xsl php8-zip s6 COPY configuration /etc/ diff --git a/configuration/php7/php-fpm.conf b/configuration/php7/php-fpm.conf deleted file mode 100644 index 38b809c..0000000 --- a/configuration/php7/php-fpm.conf +++ /dev/null @@ -1,7 +0,0 @@ -[global] -pid = /var/run/php-fpm7.pid - -error_log = /proc/self/fd/2 -daemonize = no - -include=/etc/php7/php-fpm.d/*.conf diff --git a/configuration/php8/php-fpm.conf b/configuration/php8/php-fpm.conf new file mode 100644 index 0000000..ba275ba --- /dev/null +++ b/configuration/php8/php-fpm.conf @@ -0,0 +1,7 @@ +[global] +pid = /var/run/php-fpm8.pid + +error_log = /proc/self/fd/2 +daemonize = no + +include=/etc/php8/php-fpm.d/*.conf diff --git a/configuration/php7/php.ini b/configuration/php8/php.ini similarity index 100% rename from configuration/php7/php.ini rename to configuration/php8/php.ini