From 9ff0ff517d7f1e5641b9e54a861752e72146cd8b Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Thu, 10 Oct 2024 00:23:55 +0300 Subject: [PATCH] image: use jdupes deduplicate data if possible --- Dockerfile | 3 ++- Dockerfile.base | 4 +++- Dockerfile.deps | 3 ++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33fbfbb..cf18aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -196,7 +196,8 @@ RUN apt-install-angie-mod.sh \ zip \ zstd \ ; \ - apt-clean.sh + apt-clean.sh ; \ + jdupes -1LSpr /usr/ ## adjust permissions/ownership RUN d='/etc/angie' ; \ diff --git a/Dockerfile.base b/Dockerfile.base index 7faa62a..ce5c8ee 100644 --- a/Dockerfile.base +++ b/Dockerfile.base @@ -54,6 +54,7 @@ RUN apt-env.sh apt-get update ; \ apt-env.sh apt-get upgrade -y ; \ apt-install.sh \ cron \ + jdupes \ logrotate \ netbase \ openssl \ @@ -242,7 +243,8 @@ RUN certifi_pem="${PYTHON_SITE_PACKAGES}/pip/_vendor/certifi/cacert.pem" ; \ RUN find /usr/local/sbin/ ! -type d -ls -delete ; \ find /run/ -mindepth 1 -ls -delete || : ; \ - install -d -m 01777 /run/lock + install -d -m 01777 /run/lock ; \ + jdupes -1LSpr /usr/ ## --- diff --git a/Dockerfile.deps b/Dockerfile.deps index 9ce4ee9..0f3d02f 100644 --- a/Dockerfile.deps +++ b/Dockerfile.deps @@ -86,4 +86,5 @@ RUN apt-install.sh \ ; \ apt-clean.sh -RUN find /usr/local/sbin/ ! -type d -ls -delete +RUN find /usr/local/sbin/ ! -type d -ls -delete ; \ + jdupes -1LSpr /usr/