From 359c915d01fcd9e64282ae0904d2ce11db3abe87 Mon Sep 17 00:00:00 2001 From: Mike McCready <66998419+MikeMcC399@users.noreply.github.com> Date: Wed, 7 Aug 2024 20:30:27 +0200 Subject: [PATCH] build: remove factory /usr/share/man deletion (#1185) * build: remove factory /usr/share/man deletion * Update CONTRIBUTING.md * Trigger CI --------- Co-authored-by: Jennifer Shehane --- CONTRIBUTING.md | 8 ++++++-- factory/.env | 2 +- factory/CHANGELOG.md | 4 ++++ factory/factory.Dockerfile | 1 - 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1571815121..d29753d719 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -144,10 +144,14 @@ To avoid bloating the Docker layers with extraneous files, after every `RUN` cal ```bash rm -rf /usr/share/doc && \ - rm -rf /usr/share/man && \ - rm -rf /var/lib/apt/lists/* +rm -rf /usr/share/man && \ +rm -rf /var/lib/apt/lists/* ``` +Note that due to the use of `debian:-slim` the directories `/usr/share/doc` and `/usr/share/man` already have minimal content. + +Deleting `/usr/share/man` has been removed as a default cleanup command due to side effects of preventing installation of some other Debian packages. + ### Use the `--no-install-recommends` with `apt-get` Whenever upgrading or installing packages with `apt-get`, use the `--no-install-recommends` flag to ensure that `apt-get` installs only the minimum packages required. diff --git a/factory/.env b/factory/.env index f88be9fe9d..b50a1fc452 100644 --- a/factory/.env +++ b/factory/.env @@ -14,7 +14,7 @@ NODE_VERSION="${FACTORY_DEFAULT_NODE_VERSION}" # Update the FACTORY_VERSION to deploy cypress/factory if you make changes to # BASE_IMAGE, FACTORY_DEFAULT_NODE_VERSION, YARN_VERSION, factory.Dockerfile or installScripts -FACTORY_VERSION='4.0.5' +FACTORY_VERSION='4.0.6' # Chrome versions: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable CHROME_VERSION='127.0.6533.88-1' diff --git a/factory/CHANGELOG.md b/factory/CHANGELOG.md index 9191bd3568..1fcf3bb629 100644 --- a/factory/CHANGELOG.md +++ b/factory/CHANGELOG.md @@ -1,5 +1,9 @@ # Change log +## 4.0.6 + +- Reinstates empty directory structure `/usr/share/man` which was previously removed as part of factory build process. Addresses [#1184](https://github.com/cypress-io/cypress-docker-images/issues/1184) + ## 4.0.5 - Updated default node version from `20.15.1` to `20.16.0`. Addressed in [#1182](https://github.com/cypress-io/cypress-docker-images/pull/1182) diff --git a/factory/factory.Dockerfile b/factory/factory.Dockerfile index ba48906c02..6ebe126819 100644 --- a/factory/factory.Dockerfile +++ b/factory/factory.Dockerfile @@ -121,7 +121,6 @@ ONBUILD RUN apt-get purge -y --auto-remove \ gnupg \ dirmngr\ && rm -rf /usr/share/doc \ - && rm -rf /usr/share/man \ && rm -rf /var/lib/apt/lists/* \ # Remove cypress install scripts && rm -rf /opt/installScripts