fixed 12,14,16,20,cron,

minzkn · Dec 15, 2024 · 63ac083 · 63ac083
1 parent f625d74
commit 63ac083
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 73 deletions.
diff --git a/12.04/Dockerfile b/12.04/Dockerfile
@@ -78,21 +78,18 @@ RUN apt-get autoclean -y \
   && sed -i -re 's/([a-z]{2}\.)?archive.ubuntu.com|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list \
   && apt-get update --list-cleanup \
   && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
   && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
   && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
-
-RUN apt-get install -y ssh sed \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y ssh sed \
   && mkdir -p /run/sshd \
   && sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_loginuid.so/' /etc/pam.d/sshd \
   && cp -f /etc/ssh/sshd_config /etc/ssh/sshd_config.org \
   && echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config \
   && echo "GatewayPorts yes" >> /etc/ssh/sshd_config \
   && echo "ClientAliveInterval 60" >> /etc/ssh/sshd_config \
-  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config
-
-RUN apt-get install -y \
+  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config \
+  && apt-get install -y \
   sudo \
   build-essential \
   binutils \
@@ -142,9 +139,8 @@ RUN apt-get install -y \
   whois \
   dnsutils \
   inetutils-ping \
-  lib32z1
-
-RUN apt-get autoclean -y \
+  lib32z1 \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/14.04/Dockerfile b/14.04/Dockerfile
@@ -77,21 +77,18 @@ RUN apt-get autoclean -y \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
   && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
   && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
   && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
-
-RUN apt-get install -y ssh sed \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y ssh sed \
   && mkdir -p /run/sshd \
   && sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_loginuid.so/' /etc/pam.d/sshd \
   && cp -f /etc/ssh/sshd_config /etc/ssh/sshd_config.org \
   && echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config \
   && echo "GatewayPorts yes" >> /etc/ssh/sshd_config \
   && echo "ClientAliveInterval 60" >> /etc/ssh/sshd_config \
-  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config
-
-RUN apt-get install -y \
+  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config \
+  && apt-get install -y \
   sudo \
   build-essential \
   binutils \
@@ -141,9 +138,8 @@ RUN apt-get install -y \
   iproute2 \
   whois \
   dnsutils \
-  inetutils-ping
-
-RUN apt-get autoclean -y \
+  inetutils-ping \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/16.04/Dockerfile b/16.04/Dockerfile
@@ -77,21 +77,18 @@ RUN apt-get autoclean -y \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
   && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
   && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
   && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
-
-RUN apt-get install -y ssh sed \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y ssh sed \
   && mkdir -p /run/sshd \
   && sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_loginuid.so/' /etc/pam.d/sshd \
   && cp -f /etc/ssh/sshd_config /etc/ssh/sshd_config.org \
   && echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config \
   && echo "GatewayPorts yes" >> /etc/ssh/sshd_config \
   && echo "ClientAliveInterval 60" >> /etc/ssh/sshd_config \
-  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config
-
-RUN apt-get install -y \
+  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config \
+  && apt-get install -y \
   sudo \
   build-essential \
   binutils \
@@ -142,9 +139,8 @@ RUN apt-get install -y \
   iproute2 \
   whois \
   dnsutils \
-  inetutils-ping
-
-RUN apt-get autoclean -y \
+  inetutils-ping \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/20.04/Dockerfile b/20.04/Dockerfile
@@ -77,22 +77,19 @@ RUN apt-get autoclean -y \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
   && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
   && yes | unminimize \
   && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
   && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
-
-RUN apt-get install -y ssh sed \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y ssh sed \
   && mkdir -p /run/sshd \
   && sed -ri 's/^session\s+required\s+pam_loginuid.so$/session optional pam_loginuid.so/' /etc/pam.d/sshd \
   && cp -f /etc/ssh/sshd_config /etc/ssh/sshd_config.org \
   && echo "AllowTcpForwarding yes" >> /etc/ssh/sshd_config \
   && echo "GatewayPorts yes" >> /etc/ssh/sshd_config \
   && echo "ClientAliveInterval 60" >> /etc/ssh/sshd_config \
-  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config
-
-RUN apt-get install -y \
+  && echo "ClientAliveCountMax 3" >> /etc/ssh/sshd_config \
+  && apt-get install -y \
   sudo \
   build-essential \
   binutils \
@@ -149,9 +146,8 @@ RUN apt-get install -y \
   inetutils-ping \
   cron \
   logrotate \
-  parallel
-
-RUN apt-get autoclean -y \
+  parallel \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/cron/Dockerfile b/cron/Dockerfile
@@ -40,12 +40,10 @@ RUN apt-get autoclean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
-  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y
-
-RUN apt-get install -y \
-  tzdata vim cron
-
-RUN apt-get autoclean -y \
+  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
+  && apt-get install -y \
+  tzdata vim cron \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/www-24.04/Dockerfile b/www-24.04/Dockerfile
@@ -41,13 +41,12 @@ RUN apt-get autoclean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
-  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
-  && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
-  && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
+  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y
 
-RUN apt-get install -y \
+RUN apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
+  && locale-gen en_US.UTF-8 \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y \
   apache2 \
   libapache2-mod-security2 \
   php php-intl php-bz2 php-zip php-xml php-json php-mbstring php-gd php-imagick php-sqlite3 php-mysql \
@@ -64,9 +63,8 @@ RUN apt-get install -y \
   ffmpeg \
   libsubtitles-perl \
   && a2enmod security2 ssl rewrite headers proxy proxy_http proxy_wstunnel cgi \
-  && a2ensite default-ssl.conf
-
-RUN apt-get autoclean -y \
+  && a2ensite default-ssl.conf \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/www-latest/Dockerfile b/www-latest/Dockerfile
@@ -41,13 +41,12 @@ RUN apt-get autoclean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
-  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
-  && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
-  && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
+  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y
 
-RUN apt-get install -y \
+RUN apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
+  && locale-gen en_US.UTF-8 \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y \
   apache2 \
   libapache2-mod-security2 \
   php php-intl php-bz2 php-zip php-xml php-json php-mbstring php-gd php-imagick php-sqlite3 php-mysql \
@@ -64,9 +63,8 @@ RUN apt-get install -y \
   ffmpeg \
   libsubtitles-perl \
   && a2enmod security2 ssl rewrite headers proxy proxy_http proxy_wstunnel cgi \
-  && a2ensite default-ssl.conf
-
-RUN apt-get autoclean -y \
+  && a2ensite default-ssl.conf \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/www/Dockerfile b/www/Dockerfile
@@ -41,13 +41,12 @@ RUN apt-get autoclean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get update --list-cleanup \
-  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y \
-  && DEBCONF_NOWARNINGS="yes" apt-get install -y debconf-utils apt-utils software-properties-common \
-  && apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
-  && locale-gen en_US.UTF-8 \
-  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US
+  && DEBCONF_NOWARNINGS="yes" apt-get upgrade -y
 
-RUN apt-get install -y \
+RUN apt-get install -y tzdata ca-certificates openssl ssl-cert locales \
+  && locale-gen en_US.UTF-8 \
+  && update-locale LANG=en_US.UTF-8 LANGUAGE=en_US \
+  && apt-get install -y \
   apache2 \
   libapache2-mod-security2 \
   php php-intl php-bz2 php-zip php-xml php-json php-mbstring php-gd php-imagick php-sqlite3 php-mysql \
@@ -64,9 +63,8 @@ RUN apt-get install -y \
   ffmpeg \
   libsubtitles-perl \
   && a2enmod security2 ssl rewrite headers proxy proxy_http proxy_wstunnel cgi \
-  && a2ensite default-ssl.conf
-
-RUN apt-get autoclean -y \
+  && a2ensite default-ssl.conf \
+  && apt-get autoclean -y \
   && apt-get clean -y \
   && apt-get autoremove -y --purge \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*