first G2v2 release

accetto · Nov 26, 2022 · ba55e7c · ba55e7c
1 parent b393213
commit ba55e7c
Show file tree

Hide file tree

Showing 15 changed files with 334 additions and 98 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,26 @@
 
 ***
 
-### Final release 22.03.1
+### Release 22.11
+
+The repository has been revived, because I've noticed, that the images are still pulled.
+
+This is the first release of the **second version** (G2v2) of the project, which brings improvements mostly in the building pipeline and helper utilities.
+
+The **first version** (G2v1, or simply G2) will still be available in this **GitHub** repository as the archived branch `archived-generation-g2v1`.
+
+The most significant changes in this release are:
+
+- The values of the **version sticker** variables (`VERSION_STICKER_*`) in the `env` hook scripts are not hardcoded, but initialized from the related environment variables.
+- The helper utility `util-refresh-readme.sh` does not update the original `README.md` files, but their clones `scrap_readme.md`. The content of these temporary files is intended to be copy-and-pasted to the **Docker Hub**.
+
+Current versions:
+- Ubuntu **18.04.6**
+- Chrome **107.0.5304.121**
+- Chromium **107.0.5304.87**
+- Firefox **107.0**
+
+### Final G2v1 release 22.03.1
 
 The repository is **retired** and **archived**. It will not be developed any further and the related images on Docker Hub will not be rebuilt any more. They will phase out and they will be deleted after becoming too old.
 

diff --git a/README.md b/README.md
@@ -4,12 +4,6 @@
 
 [Docker Hub][this-docker] - [Git Hub][this-github] - [Changelog][this-changelog] - [Wiki][this-wiki] - [Hierarchy][this-wiki-image-hierarchy]
 
-***
-
-**Attention!** The repository is **retired** and **archived**. It will not be developed any further and the related images on Docker Hub will not be rebuilt any more. They will phase out and they will be deleted after becoming too old. Please use the newer **third generation** (G3) repository [accetto/ubuntu-vnc-xfce-g3][accetto-ubuntu-vnc-xfce-g3] and the related images on Docker Hub instead. If you still need images based on `Ubuntu 18.04 LTS`, then feel free using the repository for building the images locally.
-
-***
-
 ![badge-github-release][badge-github-release]
 ![badge-github-release-date][badge-github-release-date]
 ![badge-github-stars][badge-github-stars]
@@ -20,13 +14,48 @@
 ![badge-github-commits][badge-github-commits]
 ![badge-github-last-commit][badge-github-last-commit]
 
-**Tip** If you want newer images based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+***
+
+- [Headless Ubuntu/Xfce containers with VNC/noVNC](#headless-ubuntuxfce-containers-with-vncnovnc)
+  - [Project `accetto/xubuntu-vnc-novnc`](#project-accettoxubuntu-vnc-novnc)
+    - [Introduction](#introduction)
+    - [Image generations](#image-generations)
+    - [Project versions](#project-versions)
+    - [Description](#description)
+    - [Git Hub subfolders / Docker image sets](#git-hub-subfolders--docker-image-sets)
+      - [xubuntu-vnc-novnc](#xubuntu-vnc-novnc)
+      - [xubuntu-vnc-novnc-chromium](#xubuntu-vnc-novnc-chromium)
+      - [xubuntu-vnc-novnc-firefox](#xubuntu-vnc-novnc-firefox)
+      - [utils](#utils)
+  - [Issues](#issues)
+  - [Credits](#credits)
 
 ***
 
-This project repository contains resources for building various Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment and [VNC][tigervnc]/[noVNC][novnc] servers for headless use.
+### Introduction
+
+This repository contains resources for building Docker images based on [Ubuntu 18.04 LTS][docker-ubuntu] with [Xfce][xfce] desktop environment and [VNC][tigervnc]/[noVNC][novnc] servers for headless use.
+
+### Image generations
+
+This is the **second generation** (G2) of my headless images, that I've retired back in March 2022. However, because I've noticed that the images are still pulled, I've revived the project in November 2022. The current **second version** (G2v2) brings some improvements, mostly in the building pipeline and supporting scripts.
+
+If you want the **newer images** based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+
+### Project versions
+
+This file describes the **second version** (G2v2) of the project.
+
+The **first version** (G2v1, or simply G2) will still be available in this **GitHub** repository as the archived branch `archived-generation-g2v1`.
+
+The version `G2v2` brings the following changes comparing to the previous version `G2v1`:
+
+- The values of the **version sticker** variables (`VERSION_STICKER_*`) in the `env` hook scripts are not hardcoded, but initialized from the related environment variables.
+- The helper utility `util-refresh-readme.sh` does not update the original `README.md` files, but their clones `scrap_readme.md`. The content of these temporary files is intended to be copy-and-pasted to the **Docker Hub**.
+
+### Description
 
-The resources for the individual images and their variations are stored in the subfolders of the [Git Hub][this-github] repository and the image features are described in the individual README files. Additional descriptions can be found in the common project [Wiki][this-wiki].
+The resources for the individual images and their variations are stored in the folders of the [Git Hub][this-github] repository and the image features are described in the individual README files. Additional descriptions can be found in the common project [Wiki][this-wiki].
 
 All images are part of a growing [image hierarchy][this-wiki-image-hierarchy].
 

diff --git a/docker/.dockerignore b/docker/.dockerignore
@@ -0,0 +1,3 @@
+*
+!src
+!xubuntu-vnc-novnc*
diff --git a/docker/xubuntu-vnc-novnc-chrome/README.md b/docker/xubuntu-vnc-novnc-chrome/README.md
@@ -4,24 +4,42 @@
 
 [Docker Hub][this-docker] - [Git Hub][this-github] - [Changelog][this-changelog] - [Wiki][this-wiki] - [Hierarchy][this-wiki-image-hierarchy]
 
-***
-
-**Attention!** The repository is **retired** and **archived**. It will not be developed any further and the related images on Docker Hub will not be rebuilt any more. They will phase out and they will be deleted after becoming too old. Please use the newer **third generation** (G3) repository [accetto/ubuntu-vnc-xfce-g3][accetto-ubuntu-vnc-xfce-g3] and the related images on Docker Hub instead. If you still need images based on `Ubuntu 18.04 LTS`, then feel free using the repository for building the images locally.
-
-***
-
 ![badge-docker-pulls][badge-docker-pulls]
 ![badge-docker-stars][badge-docker-stars]
 ![badge-github-release][badge-github-release]
 ![badge-github-release-date][badge-github-release-date]
 
-**Tip** If you want newer images based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+***
+
+- [Headless Ubuntu/Xfce container with VNC/noVNC and Google Chrome](#headless-ubuntuxfce-container-with-vncnovnc-and-google-chrome)
+  - [accetto/xubuntu-vnc-novnc-chrome](#accettoxubuntu-vnc-novnc-chrome)
+    - [Introduction](#introduction)
+    - [Description](#description)
+    - [Image tags](#image-tags)
+    - [Dockerfiles](#dockerfiles)
+    - [Ports](#ports)
+    - [Volumes](#volumes)
+    - [Container user accounts](#container-user-accounts)
+    - [Version sticker](#version-sticker)
+  - [Using headless containers](#using-headless-containers)
+  - [Issues](#issues)
+  - [Credits](#credits)
+
+***
 
 **Attention** [Google Chrome][chrome] in this image runs in `--no-sandbox` mode. You should be aware of the implications. The image is intended for testing and development.
 
 ***
 
-This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc]/[noVNC][novnc] servers for headless use and the current [Google Chrome][chrome] web browser.
+### Introduction
+
+This repository contains resources for building Docker images based on [Ubuntu 18.04 LTS][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc]/[noVNC][novnc] servers for headless use and the current [Google Chrome][chrome] web browser.
+
+This is the **second generation** (G2) of my headless images, that I've retired back in March 2022. However, because I've noticed that the images are still pulled, I've revived the project in November 2022. The current **second version** (G2v2) brings some improvements, mostly in the building pipeline and supporting scripts.
+
+If you want the **newer images** based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+
+### Description
 
 The images are part of the growing [image hierarchy][this-wiki-image-hierarchy] and they are based on [accetto/xubuntu-vnc-novnc][accetto-docker-xubuntu-vnc-novnc]. They inherit all the features and therefore not the whole description will be repeated here.
 

diff --git a/docker/xubuntu-vnc-novnc-chrome/hooks/env b/docker/xubuntu-vnc-novnc-chrome/hooks/env
@@ -10,8 +10,8 @@ DOCKER_REPO=${DOCKER_REPO:-accetto/xubuntu-vnc-novnc-chrome}
 BASETAG=""
 TODAY=$(date +%Y-%m-%d)
 
-### Warning! The values must be explicit strings (used by utils).
-VERSION_STICKER_LATEST="ubuntu18.04.6-chrome99.0.4844.51"
+### Warning! The values are initialized from the related environment variables.
+VERSION_STICKER_LATEST="${G2_STICKER_BASE:-ubuntu18.04.6}-${G2_STICKER_CHROME:-chrome}"
 
 VERSION_STICKER="${VERSION_STICKER_LATEST}"
 

diff --git a/docker/xubuntu-vnc-novnc-chromium/README.md b/docker/xubuntu-vnc-novnc-chromium/README.md
@@ -4,24 +4,42 @@
 
 [Docker Hub][this-docker] - [Git Hub][this-github] - [Changelog][this-changelog] - [Wiki][this-wiki] - [Hierarchy][this-wiki-image-hierarchy]
 
-***
-
-**Attention!** The repository is **retired** and **archived**. It will not be developed any further and the related images on Docker Hub will not be rebuilt any more. They will phase out and they will be deleted after becoming too old. Please use the newer **third generation** (G3) repository [accetto/ubuntu-vnc-xfce-g3][accetto-ubuntu-vnc-xfce-g3] and the related images on Docker Hub instead. If you still need images based on `Ubuntu 18.04 LTS`, then feel free using the repository for building the images locally.
-
-***
-
 ![badge-docker-pulls][badge-docker-pulls]
 ![badge-docker-stars][badge-docker-stars]
 ![badge-github-release][badge-github-release]
 ![badge-github-release-date][badge-github-release-date]
 
-**Tip** If you want newer images based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+***
+
+- [Headless Ubuntu/Xfce container with VNC/noVNC and Chromium](#headless-ubuntuxfce-container-with-vncnovnc-and-chromium)
+  - [accetto/xubuntu-vnc-novnc-chromium](#accettoxubuntu-vnc-novnc-chromium)
+    - [Introduction](#introduction)
+    - [Description](#description)
+    - [Image tags](#image-tags)
+    - [Dockerfiles](#dockerfiles)
+    - [Ports](#ports)
+    - [Volumes](#volumes)
+    - [Container user accounts](#container-user-accounts)
+    - [Version sticker](#version-sticker)
+  - [Using headless containers](#using-headless-containers)
+  - [Issues](#issues)
+  - [Credits](#credits)
+
+***
 
 **Attention** [Chromium Browser][chromium] in this image runs in `--no-sandbox` mode. You should be aware of the implications. The image is intended for testing and development.
 
 ***
 
-This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc]/[noVNC][novnc] servers for headless use and the current [Chromium][chromium] web browser.
+### Introduction
+
+This repository contains resources for building Docker images based on [Ubuntu 18.04 LTS][docker-ubuntu] with [Xfce][xfce] desktop environment and [VNC][tigervnc]/[noVNC][novnc] servers for headless use.
+
+This is the **second generation** (G2) of my headless images, that I've retired back in March 2022. However, because I've noticed that the images are still pulled, I've revived the project in November 2022. The current **second version** (G2v2) brings some improvements, mostly in the building pipeline and supporting scripts.
+
+If you want the **newer images** based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+
+### Description
 
 The images are part of the growing [image hierarchy][this-wiki-image-hierarchy] and they are based on [accetto/xubuntu-vnc-novnc][accetto-docker-xubuntu-vnc-novnc]. They inherit all the features and therefore not the whole description will be repeated here.
 

diff --git a/docker/xubuntu-vnc-novnc-chromium/hooks/env b/docker/xubuntu-vnc-novnc-chromium/hooks/env
@@ -10,8 +10,8 @@ DOCKER_REPO=${DOCKER_REPO:-accetto/xubuntu-vnc-novnc-chromium}
 BASETAG=""
 TODAY=$(date +%Y-%m-%d)
 
-### Warning! The values must be explicit strings (used by utils).
-VERSION_STICKER_LATEST="ubuntu18.04.6-chromium99.0.4844.51"
+### Warning! The values are initialized from the related environment variables.
+VERSION_STICKER_LATEST="${G2_STICKER_BASE:-ubuntu18.04.6}-${G2_STICKER_CHROMIUM:-chromium}"
 
 VERSION_STICKER="${VERSION_STICKER_LATEST}"
 

diff --git a/docker/xubuntu-vnc-novnc-firefox/README.md b/docker/xubuntu-vnc-novnc-firefox/README.md
@@ -4,18 +4,29 @@
 
 [Docker Hub][this-docker] - [Git Hub][this-github] - [Changelog][this-changelog] - [Wiki][this-wiki] - [Hierarchy][this-wiki-image-hierarchy]
 
-***
-
-**Attention!** The repository is **retired** and **archived**. It will not be developed any further and the related images on Docker Hub will not be rebuilt any more. They will phase out and they will be deleted after becoming too old. Please use the newer **third generation** (G3) repository [accetto/ubuntu-vnc-xfce-g3][accetto-ubuntu-vnc-xfce-g3] and the related images on Docker Hub instead. If you still need images based on `Ubuntu 18.04 LTS`, then feel free using the repository for building the images locally.
-
-***
-
 ![badge-docker-pulls][badge-docker-pulls]
 ![badge-docker-stars][badge-docker-stars]
 ![badge-github-release][badge-github-release]
 ![badge-github-release-date][badge-github-release-date]
 
-**Tip** If you want newer images based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+***
+
+- [Headless Ubuntu/Xfce container with VNC/noVNC and Firefox](#headless-ubuntuxfce-container-with-vncnovnc-and-firefox)
+  - [accetto/xubuntu-vnc-novnc-firefox](#accettoxubuntu-vnc-novnc-firefox)
+    - [Introduction](#introduction)
+    - [Description](#description)
+    - [Image tags](#image-tags)
+    - [Dockerfiles](#dockerfiles)
+    - [Ports](#ports)
+    - [Volumes](#volumes)
+    - [Container user accounts](#container-user-accounts)
+    - [Version sticker](#version-sticker)
+    - [Using headless containers](#using-headless-containers)
+  - [Firefox multi-process](#firefox-multi-process)
+    - [Setting shared memory size](#setting-shared-memory-size)
+  - [Firefox preferences and the plus features](#firefox-preferences-and-the-plus-features)
+  - [Issues](#issues)
+  - [Credits](#credits)
 
 ***
 
@@ -25,7 +36,15 @@ Starting from the release **20.10.1**, there is no single-process Firefox image
 
 ***
 
-This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc]/[noVNC][novnc] servers for headless use and the current [Firefox Quantum][firefox] web browser.
+### Introduction
+
+This repository contains resources for building Docker images based on [Ubuntu 18.04 LTS][docker-ubuntu] with [Xfce][xfce] desktop environment and [VNC][tigervnc]/[noVNC][novnc] servers for headless use.
+
+This is the **second generation** (G2) of my headless images, that I've retired back in March 2022. However, because I've noticed that the images are still pulled, I've revived the project in November 2022. The current **second version** (G2v2) brings some improvements, mostly in the building pipeline and supporting scripts.
+
+If you want the **newer images** based on [Ubuntu 20.04 LTS][docker-ubuntu] with the latest [TigerVNC][tigervnc-releases]/[noVNC][novnc-releases] versions, please check the **third generation** (G3) [accetto/ubuntu-vnc-xfce-g3][accetto-docker-ubuntu-vnc-xfce-g3], [accetto/ubuntu-vnc-xfce-chromium-g3][accetto-docker-ubuntu-vnc-xfce-chromium-g3] or [accetto/ubuntu-vnc-xfce-firefox-g3][accetto-docker-ubuntu-vnc-xfce-firefox-g3].
+
+### Description
 
 The main image is a streamlined and simplified version of my other image [accetto/ubuntu-vnc-xfce-firefox-plus][accetto-docker-ubuntu-vnc-xfce-firefox-plus]. The applicable **plus** features have been re-implemented because **Firefox v67** handles user profiles differently.
 

diff --git a/docker/xubuntu-vnc-novnc-firefox/hooks/env b/docker/xubuntu-vnc-novnc-firefox/hooks/env
@@ -10,9 +10,9 @@ BASETAG=""
 TODAY=$(date +%Y-%m-%d)
 VERSION_STICKER=""
 
-### Warning! The values must be explicit strings (used by utils).
-VERSION_STICKER_LATEST="ubuntu18.04.6-firefox98.0"
-VERSION_STICKER_DEFAULT="ubuntu18.04.6-firefox98.0"
+### Warning! The values are initialized from the related environment variables.
+VERSION_STICKER_LATEST="${G2_STICKER_BASE:-ubuntu18.04.6}-${G2_STICKER_FIREFOX:-firefox}"
+VERSION_STICKER_DEFAULT="${G2_STICKER_BASE:-ubuntu18.04.6}-${G2_STICKER_FIREFOX:-firefox}"
 
 case "${DOCKER_TAG}" in