release 19.10.3

accetto · Oct 18, 2019 · c14e62c · c14e62c
1 parent 9ae7cb1
commit c14e62c
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,14 @@
 
 ***
 
+### Version 19.10.3
+
+- README updated
+  - **version sticker** described
+  - new badges added
+- build hooks updated
+  - command line arguments passed to `build` hook
+
 ### Version 19.10.2
 
 - badges re-designed

diff --git a/README.md b/README.md
@@ -10,6 +10,13 @@
 ![badge-docker-stars][badge-docker-stars]
 ![badge-github-release][badge-github-release]
 ![badge-github-release-date][badge-github-release-date]
+![badge-github-stars][badge-github-stars]
+![badge-github-forks][badge-github-forks]
+![badge-github-open-issues][badge-github-open-issues]
+![badge-github-closed-issues][badge-github-closed-issues]
+![badge-github-releases][badge-github-releases]
+![badge-github-commits][badge-github-commits]
+![badge-github-last-commit][badge-github-last-commit]
 
 **TIP** Unless you need [nss_wrapper][nsswrapper], you can also use my newer image [accetto/xubuntu-vnc-novnc-chromium][accetto-docker-xubuntu-vnc-novnc-chromium], which is a streamlined version of this image ([image hierarchy][accetto-xubuntu-vnc-novnc-wiki-image-hierarchy]). If you also don't need [noVNC][novnc], you can use even a slimmer image [accetto/xubuntu-vnc-chromium][accetto-docker-xubuntu-vnc-chromium], which is a member of another growing family of application images ([image hierarchy][accetto-xubuntu-vnc-wiki-image-hierarchy]). The newer images include also **sudo** command.
 
@@ -75,6 +82,24 @@ The following mounting point is specific to Chromium:
 
 Both *named volumes* and *bind mounts* can be used. More about volumes can be found in [Docker documentation][docker-doc] (e.g. [Manage data in Docker][docker-doc-managing-data]).
 
+### Version sticker
+
+Version sticker serves multiple purposes that are closer described in [Wiki][this-wiki]. The **version sticker value** identifies the version of the docker image and it is persisted in it when it is built. It is also shown as a badge in the README file.
+
+However, the script `version_sticker.sh` can be used anytime for convenient checking of the current versions of installed applications.
+
+The script is deployed into the startup folder, which is defined by the environment variable `STARTUPDIR` with the default value of `/dockerstartup`.
+
+If the script is executed inside a container without an argument, then it returns the **current version sticker value** of the container. This value is newly calculated and it is based on the current versions of the essential applications in the container.
+
+The **current** version sticker value will differ from the **persisted** value, if any of the included application has been updated to another version.
+
+If the script is called with the argument `-v` (lower case `v`), then it prints out verbose versions of the essential applications that are included in the **version sticker value**.
+
+If it is called with the argument `-V` (upper case `v`), then it prints out verbose versions of some more applications.
+
+Examples can be found in [Wiki][this-wiki].
+
 ## Running containers in background (detached)
 
 Created containers will run under the non-root user **headless:headless** by default.
@@ -252,6 +277,20 @@ Credit goes to all the countless people and companies who contribute to open sou
 
 [badge-github-release-date]: https://img.shields.io/github/release-date/accetto/ubuntu-vnc-xfce-chromium?logo=github
 
+[badge-github-stars]: https://badgen.net/github/stars/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=stars
+
+[badge-github-forks]: https://badgen.net/github/forks/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=forks
+
+[badge-github-releases]: https://badgen.net/github/releases/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=releases
+
+[badge-github-commits]: https://badgen.net/github/commits/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=commits
+
+[badge-github-last-commit]: https://badgen.net/github/last-commit/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=last%20commit
+
+[badge-github-closed-issues]: https://badgen.net/github/closed-issues/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=closed%20issues
+
+[badge-github-open-issues]: https://badgen.net/github/open-issues/accetto/ubuntu-vnc-xfce-chromium?icon=github&label=open%20issues
+
 <!-- latest tag badges -->
 
 [badge-VERSION_STICKER_LATEST]: https://badgen.net/badge/version%20sticker/ubuntu18.04.3-chromium77.0.3865.90/blue

diff --git a/hooks/build b/hooks/build
@@ -4,7 +4,7 @@
 
 if [[ -n "${BASETAG}" ]] ; then
 
-    docker build \
+    docker build $@ \
         -f ${DOCKERFILE_PATH} \
             --build-arg BASETAG="${BASETAG}" \
             --build-arg ARG_REFRESHED_AT="${TODAY}" \

diff --git a/hooks/env b/hooks/env
@@ -2,6 +2,8 @@
 
 SOURCE_BRANCH=${SOURCE_BRANCH:-$1}
 DOCKER_TAG=${DOCKER_TAG:-$1}
+if [[ -n "$1" ]] ; then shift ; fi
+
 DOCKERFILE_PATH=${DOCKERFILE_PATH:-./Dockerfile}
 DOCKER_REPO=${DOCKER_REPO:-accetto/ubuntu-vnc-xfce-chromium}