use new nginx config paths

This commit is contained in:
Sebastian Hugentobler 2021-06-20 13:35:10 +02:00
parent 472f3b1a61
commit 6e7a19b094
Signed by: shu
GPG Key ID: BB32CF3CA052C2F0
2 changed files with 19 additions and 20 deletions

View File

@ -1,4 +1,4 @@
FROM thallian/php8-fpm:latest FROM thallian/php7-fpm:latest
ENV FPMUSER nginx ENV FPMUSER nginx
ENV FPMGROUP nginx ENV FPMGROUP nginx
@ -10,22 +10,22 @@ RUN apk add --no-cache \
git \ git \
nginx \ nginx \
wget \ wget \
php8 \ php7 \
php8-opcache \ php7-opcache \
php8-pcntl \ php7-pcntl \
php8-gd \ php7-gd \
php8-sqlite3 \ php7-sqlite3 \
php8-json \ php7-json \
php8-intl \ php7-intl \
php8-xml \ php7-xml \
php8-mbstring \ php7-mbstring \
php8-zip \ php7-zip \
php8-openssl \ php7-openssl \
php8-phar \ php7-phar \
php8-pdo_sqlite \ php7-pdo_sqlite \
php8-ctype \ php7-ctype \
php8-xmlwriter \ php7-xmlwriter \
php8-dom php7-dom
RUN mkdir -p /usr/share/webapps/cops 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 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 chown -R nginx:nginx /usr/share/webapps/cops
RUN mkdir /run/nginx RUN rm /etc/nginx/http.d/default.conf
RUN rm /etc/nginx/conf.d/default.conf
ADD /rootfs / ADD /rootfs /

View File

@ -1,3 +1,3 @@
[template] [template]
src = "cops.conf.tmpl" src = "cops.conf.tmpl"
dest = "/etc/nginx/conf.d/cops.conf" dest = "/etc/nginx/http.d/cops.conf"