From 3ab4a59b6ecd63a9d7a690682ce3cd236602266d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= Date: Wed, 31 May 2023 18:32:09 -0400 Subject: [PATCH] Update debian Dockerfiles to avoid updating apt packages only once --- src/linux/Dockerfile-debian | 6 ++---- src/linux/Dockerfile-fedora | 6 +++--- src/linux/Dockerfile-ubuntu | 6 ++---- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/linux/Dockerfile-debian b/src/linux/Dockerfile-debian index 86ab9d64..f8f0f604 100644 --- a/src/linux/Dockerfile-debian +++ b/src/linux/Dockerfile-debian @@ -20,8 +20,7 @@ RUN mkdir -p /usr/share/bunkerweb/deps && \ rm -rf /tmp/req # Nginx -RUN apt update && \ - apt-get install gnupg2 ca-certificates wget -y && \ +RUN apt-get install gnupg2 ca-certificates wget -y && \ echo "deb https://nginx.org/packages/debian/ bullseye nginx" > /etc/apt/sources.list.d/nginx.list && \ echo "deb-src https://nginx.org/packages/debian/ bullseye nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ @@ -29,8 +28,7 @@ RUN apt update && \ apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~bullseye # Compile and install dependencies -RUN apt update && \ - apt install --no-install-recommends bash python3-pip libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ +RUN apt install --no-install-recommends bash python3-pip libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ pip install --no-cache-dir --upgrade pip && \ pip install wheel && \ #mkdir -p /usr/share/bunkerweb/deps && \ diff --git a/src/linux/Dockerfile-fedora b/src/linux/Dockerfile-fedora index 8233a7ac..2485fd13 100644 --- a/src/linux/Dockerfile-fedora +++ b/src/linux/Dockerfile-fedora @@ -4,12 +4,12 @@ ENV OS=fedora ENV NGINX_VERSION 1.24.0 # Install fpm -RUN dnf install -y ruby ruby-devel make gcc redhat-rpm-config rpm-build && \ +RUN dnf update -y && \ + dnf install -y ruby ruby-devel make gcc redhat-rpm-config rpm-build && \ gem install fpm # Nginx -RUN dnf update -y && \ - dnf install -y curl gnupg2 ca-certificates redhat-lsb-core && \ +RUN dnf install -y curl gnupg2 ca-certificates redhat-lsb-core && \ dnf install nginx-${NGINX_VERSION} -y # Copy dependencies sources folder diff --git a/src/linux/Dockerfile-ubuntu b/src/linux/Dockerfile-ubuntu index a1174390..f0fac942 100644 --- a/src/linux/Dockerfile-ubuntu +++ b/src/linux/Dockerfile-ubuntu @@ -20,8 +20,7 @@ RUN mkdir -p /usr/share/bunkerweb/deps && \ rm -rf /tmp/req # Nginx -RUN apt update && \ - apt-get install curl gnupg2 ca-certificates lsb-release ubuntu-keyring software-properties-common -y && \ +RUN apt-get install curl gnupg2 ca-certificates lsb-release ubuntu-keyring software-properties-common -y && \ echo "deb https://nginx.org/packages/ubuntu/ jammy nginx" > /etc/apt/sources.list.d/nginx.list && \ echo "deb-src https://nginx.org/packages/ubuntu/ jammy nginx" >> /etc/apt/sources.list.d/nginx.list && \ apt-key adv --keyserver keyserver.ubuntu.com --recv-keys ABF5BD827BD9BF62 && \ @@ -29,8 +28,7 @@ RUN apt update && \ apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}-1~jammy # Compile and install dependencies -RUN apt update && \ - apt install --no-install-recommends bash python3-pip libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ +RUN apt install --no-install-recommends bash python3-pip libssl-dev git libpcre++-dev zlib1g-dev libxml2-dev libyajl-dev pkgconf libcurl4-openssl-dev libgeoip-dev liblmdb-dev apt-utils bash build-essential autoconf libtool automake g++ gcc libxml2-dev make musl-dev gnupg patch libreadline-dev libpcre3-dev libgd-dev -y && \ pip install --no-cache-dir --upgrade pip && \ pip install wheel && \ #mkdir -p /usr/share/bunkerweb/deps && \