mirror of
https://github.com/Mailu/Mailu.git
synced 2024-12-14 10:53:30 +02:00
Merge #2364
2364: Update Dockerfile r=mergify[bot] a=twekkel apt is intended for interactive usage, for scripts use apt-get (https://manpages.debian.org/bullseye/apt/apt.8.en.html) to avoid warnings. ## What type of PR? minor enhancement ## What does this PR do? replace apt with apt-get to avoid below warning WARNING: apt does not have a stable CLI interface. Use with caution in scripts. ## Prerequisites - Co-authored-by: Eddy Vervest <57325478+twekkel@users.noreply.github.com>
This commit is contained in:
commit
3844339899
@ -13,9 +13,9 @@ ENV TZ Etc/UTC
|
|||||||
LABEL version=$VERSION
|
LABEL version=$VERSION
|
||||||
|
|
||||||
RUN set -eu \
|
RUN set -eu \
|
||||||
&& apt update \
|
&& apt-get update \
|
||||||
&& echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
|
&& echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
|
||||||
&& apt install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
python3 curl python3-pip git python3-multidict \
|
python3 curl python3-pip git python3-multidict \
|
||||||
python3-jinja2 gpg gpg-agent tzdata \
|
python3-jinja2 gpg gpg-agent tzdata \
|
||||||
&& pip3 install socrate \
|
&& pip3 install socrate \
|
||||||
@ -24,7 +24,7 @@ RUN set -eu \
|
|||||||
&& sed -i 's,CustomLog.*combined$,\0 "'"expr=!(%{HTTP_USER_AGENT}=='health'\&\&(-R '127.0.0.1/8' || -R '::1'))"'",' /etc/apache2/sites-available/000-default.conf \
|
&& sed -i 's,CustomLog.*combined$,\0 "'"expr=!(%{HTTP_USER_AGENT}=='health'\&\&(-R '127.0.0.1/8' || -R '::1'))"'",' /etc/apache2/sites-available/000-default.conf \
|
||||||
\
|
\
|
||||||
&& mark="$(apt-mark showmanual)" \
|
&& mark="$(apt-mark showmanual)" \
|
||||||
&& apt install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
libfreetype6-dev libicu-dev libjpeg62-turbo-dev libldap2-dev libmagickwand-dev \
|
libfreetype6-dev libicu-dev libjpeg62-turbo-dev libldap2-dev libmagickwand-dev \
|
||||||
libpng-dev libpq-dev libsqlite3-dev libzip-dev libpspell-dev libonig-dev \
|
libpng-dev libpq-dev libsqlite3-dev libzip-dev libpspell-dev libonig-dev \
|
||||||
&& ln -s php.ini-production /usr/local/etc/php/php.ini \
|
&& ln -s php.ini-production /usr/local/etc/php/php.ini \
|
||||||
|
Loading…
Reference in New Issue
Block a user