build: remove factory /usr/share/man deletion (cypress-io#1185)

* build: remove factory /usr/share/man deletion * Update CONTRIBUTING.md * Trigger CI --------- Co-authored-by: Jennifer Shehane <[email protected]>
miqdigital · Aug 7, 2024 · 359c915 · 359c915
1 parent fbc84af
commit 359c915
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git 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:<suite>-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
@@ -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
@@ -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
@@ -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