diff --git a/Dockerfile.mariadb b/Dockerfile.mariadb index f6b7903..1be4324 100644 --- a/Dockerfile.mariadb +++ b/Dockerfile.mariadb @@ -8,9 +8,8 @@ RUN echo "APT::Acquire::Retries \"5\";" > /etc/apt/apt.conf.d/80-retries && \ echo "Acquire::http::No-Cache=true;" > /etc/apt/apt.conf.d/80-no-cache && \ echo "Acquire::http::Pipeline-Depth=0;" > /etc/apt/apt.conf.d/80-no-pipeline && \ apt-get -qq update && \ - apt-get -yqq upgrade - -RUN apt-get -yqq install --no-install-recommends \ + apt-get -yqq upgrade && \ + apt-get -yqq install --no-install-recommends \ nano \ curl \ xz-utils \ @@ -18,9 +17,10 @@ RUN apt-get -yqq install --no-install-recommends \ runit \ python3-software-properties \ software-properties-common \ - add-apt-key -RUN add-apt-repository ppa:ondrej/php -RUN apt-get -qq update && \ + add-apt-key \ + && \ + add-apt-repository ppa:ondrej/php && \ + apt-get -qq update && \ apt-get -yqq install --no-install-recommends \ #php8.1-apcu \ php8.1-bcmath \ @@ -41,8 +41,8 @@ RUN apt-get -qq update && \ && \ apt-get autoremove -yqq && \ apt-get clean && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log -RUN curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log && \ + curl https://getcomposer.org/composer-stable.phar --output /usr/local/bin/composer && \ chmod +x /usr/local/bin/composer COPY start.sh /usr/local/bin/start.sh COPY mysql.runit /etc/service/mysql/run