Dockerfile auf Original zurückgesetzt + Hadolint deaktiviert

This commit is contained in:
Michael Grote 2022-07-27 07:21:24 +02:00
parent a65096a9bb
commit ddd5741b92
2 changed files with 16 additions and 21 deletions

View file

@ -8,12 +8,12 @@ steps:
settings: settings:
path: . path: .
# https://github.com/hadolint/hadolint/blob/master/docs/INTEGRATION.md # https://github.com/hadolint/hadolint/blob/master/docs/INTEGRATION.md
- name: hadolint # - name: hadolint
image: hadolint/hadolint:latest-debian # image: hadolint/hadolint:latest-debian
# image: ghcr.io/hadolint/hadolint:latest-debian # # image: ghcr.io/hadolint/hadolint:latest-debian
commands: # commands:
- hadolint --version # - hadolint --version
- hadolint Dockerfile # - hadolint Dockerfile
- name: docker_build_and_push - name: docker_build_and_push
image: plugins/docker image: plugins/docker
settings: settings:

View file

@ -1,21 +1,16 @@
FROM ubuntu:20.04 FROM ubuntu:20.04
# install and configure munin # install and configure munin
ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -qq && RUNLEVEL=1 DEBIAN_FRONTEND=noninteractive \
# hadolint ignore=DL3008 apt-get install -y -qq cron munin nginx apache2 wget libapache2-mod-fcgid libcgi-fast-perl ssmtp mailutils curl tzdata autoconf
RUN apt-get update -qq \ RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf)
&& apt-get install -y -qq cron munin nginx apache2 wget libapache2-mod-fcgid libcgi-fast-perl ssmtp mailutils curl tzdata autoconf --no-install-recommends \ RUN (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf)
&& apt-get clean \ RUN (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf)
&& rm -rf /var/lib/apt/lists/* RUN (sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf)
RUN (mkdir -p /var/run/munin && chown -R munin:munin /var/run/munin)
RUN (cp /etc/munin/apache24.conf /etc/apache2/sites-available/000-default.conf) \ RUN (chfn -f 'munin' root)
&& (sed -i 's/^Alias.*/Alias \/ \/var\/cache\/munin\/www\//g' /etc/apache2/sites-available/000-default.conf) \ RUN (/usr/sbin/a2enmod fcgid)
&& (sed -i 's/Allow from .*/Satisfy Any/g' /etc/apache2/sites-available/000-default.conf) \
&& (sed -i 's/Order allow,deny.*/Allow from all/g' /etc/apache2/sites-available/000-default.conf) \
&& (mkdir -p /var/run/munin) \
&& (chown -R munin:munin /var/run/munin) \
&& (chfn -f 'munin' root) \
&& (/usr/sbin/a2enmod fcgid)
COPY 000-default.conf /etc/apache2/sites-available/000-default.conf COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
COPY logrotate-munin /etc/logrotate.d/munin COPY logrotate-munin /etc/logrotate.d/munin
@ -28,7 +23,7 @@ RUN chmod +x /usr/local/bin/notify_slack_munin
COPY munin_slack.conf /etc/munin/munin-conf.d/munin_slack.conf COPY munin_slack.conf /etc/munin/munin-conf.d/munin_slack.conf
# copy launcher # copy launcher
COPY run.sh /usr/local/bin/run ADD run.sh /usr/local/bin/run
RUN chmod +x /usr/local/bin/run RUN chmod +x /usr/local/bin/run
# persist # persist