From 428b8abffefe6d8870751077a19e3f2f3b056130 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Tue, 10 Aug 2021 19:16:46 +0800 Subject: [PATCH 1/2] Make sure apt lists cleaned up in Dockerfile --- build/frappe-nginx/Dockerfile | 1 + build/frappe-worker/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/frappe-nginx/Dockerfile b/build/frappe-nginx/Dockerfile index 5c5a607d..797ebca2 100644 --- a/build/frappe-nginx/Dockerfile +++ b/build/frappe-nginx/Dockerfile @@ -52,6 +52,7 @@ COPY build/common/nginx-default.conf.template /etc/nginx/conf.d/default.conf.tem COPY build/frappe-nginx/docker-entrypoint.sh / RUN apt-get update && apt-get install -y rsync && apt-get clean \ + && rm -rf /var/lib/apt/lists/* \ && echo "#!/bin/bash" > /rsync \ && chmod +x /rsync diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index ada2bda3..e47c5d9e 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -46,7 +46,8 @@ RUN apt-get update -y && apt-get install \ && wget https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6-1/wkhtmltox_0.12.6-1.buster_${ARCH}.deb \ && dpkg -i wkhtmltox_0.12.6-1.buster_${ARCH}.deb && rm wkhtmltox_0.12.6-1.buster_${ARCH}.deb \ && wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh \ - && chown -R frappe:frappe /home/frappe + && chown -R frappe:frappe /home/frappe \ + && rm -rf /var/lib/apt/lists/* \ # Setup docker-entrypoint COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh From 48e9947580d91e3019845e33d2df6e2cbe24fce4 Mon Sep 17 00:00:00 2001 From: Revant Nandgaonkar Date: Tue, 10 Aug 2021 21:33:08 +0530 Subject: [PATCH 2/2] fix: empty continuation line --- build/frappe-worker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/frappe-worker/Dockerfile b/build/frappe-worker/Dockerfile index e47c5d9e..11ca6f71 100644 --- a/build/frappe-worker/Dockerfile +++ b/build/frappe-worker/Dockerfile @@ -47,7 +47,7 @@ RUN apt-get update -y && apt-get install \ && dpkg -i wkhtmltox_0.12.6-1.buster_${ARCH}.deb && rm wkhtmltox_0.12.6-1.buster_${ARCH}.deb \ && wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh \ && chown -R frappe:frappe /home/frappe \ - && rm -rf /var/lib/apt/lists/* \ + && rm -rf /var/lib/apt/lists/* # Setup docker-entrypoint COPY build/common/worker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh