diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b12c14..6c8dbd0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ stages: variables: BRANCH: master - VERSION: 8.1-fpm + VERSION: 8.3-fpm DOCKER_HOST: tcp://docker:2375 VERSIONARCH: ${VERSION}-${ARCH} diff --git a/Dockerfile b/Dockerfile index 2e75fbf..31f2988 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # NAME leenooks/php -# VERSION 8.1-fpm-alpine +# VERSION 8.3-fpm-alpine -FROM php:8.1-fpm-alpine +FROM php:8.3-fpm-alpine # Change to http respositories, so they we can cache the install packages RUN if [ -n ${HTTP_PROXY} ] ; then sed -i -e s'/https/http/' /etc/apk/repositories; fi @@ -14,7 +14,7 @@ RUN sed -i -e 's#^memory_limit = 128M#memory_limit = 256M#' /usr/local/etc/php/p RUN adduser -g "Hosting Admin User" -u 1000 -G www-data -h /var/www/html -HD lamp # Base -RUN apk add --no-cache bash git unzip zlib nginx msmtp +RUN apk add --no-cache bash unzip zlib nginx msmtp RUN curl -SLo /usr/local/bin/wait-for-it https://github.com/vishnubob/wait-for-it/raw/master/wait-for-it.sh && chmod +x /usr/local/bin/wait-for-it # Memcache @@ -41,9 +41,6 @@ RUN apk add --no-cache libjpeg libgd libpng freetype freetype-dev zlib-dev libpn RUN curl -4 https://getcomposer.org/installer|php -- --install-dir=/usr/local/bin --filename=composer ENV COMPOSER_HOME=/var/cache/composer -# Add npm -RUN apk add --no-cache npm - # Other config COPY msmtprc /etc/ COPY docker/www.conf /usr/local/etc/php-fpm.d/ diff --git a/Dockerfile.phptest b/Dockerfile.phptest index 49f26da..2fe35de 100644 --- a/Dockerfile.phptest +++ b/Dockerfile.phptest @@ -1,7 +1,7 @@ # NAME leenooks/php -# VERSION 8.1-fpm-test +# VERSION 8.3-fpm-test -FROM registry.dege.au/leenooks/php:8.1-fpm +FROM registry.dege.au/leenooks/php:8.3-fpm # Add xdebug RUN apk --no-cache add linux-headers \ diff --git a/sshd_config.patch b/sshd_config.patch deleted file mode 100644 index 11f3ec4..0000000 --- a/sshd_config.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- /etc/ssh/sshd_config.orig 2018-02-27 08:33:29.613104521 +0000 -+++ /etc/ssh/sshd_config 2018-02-27 08:34:43.413485512 +0000 -@@ -30,6 +30,7 @@ - - #LoginGraceTime 2m - #PermitRootLogin prohibit-password -+PermitRootLogin no - #StrictModes yes - #MaxAuthTries 6 - #MaxSessions 10 -@@ -54,6 +55,7 @@ - - # To disable tunneled clear text passwords, change to no here! - #PasswordAuthentication yes -+PasswordAuthentication no - #PermitEmptyPasswords no - - # Change to yes to enable challenge-response passwords (beware issues with