diff --git a/Dockerfile b/Dockerfile index 7a3808a..182cadb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM thallian/php8-fpm:latest +FROM thallian/php7-fpm:latest ENV FPMUSER nginx ENV FPMGROUP nginx @@ -10,22 +10,22 @@ RUN apk add --no-cache \ git \ nginx \ wget \ - php8 \ - php8-opcache \ - php8-pcntl \ - php8-gd \ - php8-sqlite3 \ - php8-json \ - php8-intl \ - php8-xml \ - php8-mbstring \ - php8-zip \ - php8-openssl \ - php8-phar \ - php8-pdo_sqlite \ - php8-ctype \ - php8-xmlwriter \ - php8-dom + php7 \ + php7-opcache \ + php7-pcntl \ + php7-gd \ + php7-sqlite3 \ + php7-json \ + php7-intl \ + php7-xml \ + php7-mbstring \ + php7-zip \ + php7-openssl \ + php7-phar \ + php7-pdo_sqlite \ + php7-ctype \ + php7-xmlwriter \ + php7-dom RUN mkdir -p /usr/share/webapps/cops RUN wget -qO- https://github.com/seblucas/cops/archive/$VERSION.tar.gz | tar xz -C /usr/share/webapps/cops --strip 1 @@ -37,8 +37,7 @@ RUN php composer.phar install --no-dev --optimize-autoloader RUN chown -R nginx:nginx /usr/share/webapps/cops -RUN mkdir /run/nginx -RUN rm /etc/nginx/conf.d/default.conf +RUN rm /etc/nginx/http.d/default.conf ADD /rootfs / diff --git a/rootfs/etc/confd/conf.d/cops.conf.toml b/rootfs/etc/confd/conf.d/cops.conf.toml index 46dafa7..c337d7d 100644 --- a/rootfs/etc/confd/conf.d/cops.conf.toml +++ b/rootfs/etc/confd/conf.d/cops.conf.toml @@ -1,3 +1,3 @@ [template] src = "cops.conf.tmpl" -dest = "/etc/nginx/conf.d/cops.conf" +dest = "/etc/nginx/http.d/cops.conf"