update pipeline and remove chmod for entrypoint

This commit is contained in:
Robert Schumann
2021-12-10 21:45:46 +01:00
parent a1358b9187
commit b5271abc8a
3 changed files with 74 additions and 5 deletions

View File

@@ -1,4 +1,6 @@
FROM trafex/alpine-nginx-php7:2.0.2
ARG UPSTREAM_IMAGE=trafex/alpine-nginx-php7:2.0.2
FROM $UPSTREAM_IMAGE
LABEL maintainer="Robert Schumann <gutmensch@n-os.org>"
@@ -13,7 +15,7 @@ COPY ./manifest/ /
RUN set -x \
&& apk update \
&& apk add bash expat-dev mariadb-dev mariadb-client mariadb-connector-c openssl gzip wget perl-utils g++ make perl-dev \
&& apk add bash expat-dev mariadb-dev mariadb-client mariadb-connector-c openssl openssl-dev gzip wget perl-utils g++ make perl-dev \
&& wget -4 -q --no-check-certificate -O parser.zip $REPORT_PARSER_SOURCE \
&& wget -4 -q --no-check-certificate -O viewer.zip $REPORT_VIEWER_SOURCE \
&& unzip parser.zip && cp -av dmarcts-report-parser-master/* /usr/bin/ && rm -vf parser.zip && rm -rvf dmarcts-report-parser-master \
@@ -24,12 +26,11 @@ RUN set -x \
&& sed -i 's%.*root /var/www/html;% root /var/www/viewer;%g' /etc/nginx/nginx.conf \
&& sed -i 's/.*index index.php index.html;/ index dmarcts-report-viewer.php;/g' /etc/nginx/nginx.conf \
&& sed -i 's%files = /etc/supervisor.d/\*.ini%files = /etc/supervisor/conf.d/*.conf%g' /etc/supervisord.conf \
&& chmod 755 /entrypoint.sh \
&& (echo y;echo o conf prerequisites_policy follow;echo o conf commit)|cpan \
&& for i in \
IO::Socket::SSL \
CPAN \
CPAN::DistnameInfo \
IO::Socket::SSL \
File::MimeInfo \
IO::Compress::Gzip \
Getopt::Long \
@@ -47,7 +48,7 @@ RUN set -x \
Socket6 \
PerlIO::gzip \
; do cpan install $i; done \
&& apk del mariadb-dev expat-dev perl-dev g++ make
&& apk del mariadb-dev expat-dev openssl-dev perl-dev g++ make
HEALTHCHECK --interval=1m --timeout=3s CMD curl --silent --fail http://127.0.0.1:80/fpm-ping