release 19.08.3

CHANGELOG.md

@@ -48,6 +48,14 @@
   - **Dockerfile.typescript.firefox** and **Dockerfile.typescript.chromium** removed
   - only `firefox` tag: newer **Firefox** version (**68.0.2**, inherited from the base image)
   - only `chromium` tag: newer **Chromium Browser** version (**76.0.3809.100**, inherited from the base image)
+- **xubuntu-vnc-heroku**
+  - newer base image (**Ubuntu 18.04.3 LTS**) (inherited from the base image)
+  - build argument **ARG_REFRESHED_AT** introduced
+    - environment variable **REFRESHED_AT** set to the actual build date
+  - **TypeScript** installed by the non-root default application user (1001:0) (inherited from the base image)
+  - **Dockerfile.js.heroku.firefox** and **Dockerfile.js.heroku.chromium** removed
+  - only `firefox` tag: newer **Firefox** version (**68.0.2**, inherited from the base image)
+  - only `chromium` tag: newer **Chromium Browser** version (**76.0.3809.100**, inherited from the base image)
 
 ### Release 19.08.2
 

README.md

@@ -10,6 +10,8 @@ This project repository contains resources for building various Docker images ba
 
 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 Wiki illustrates also the project's complete [image hierarchy][this-wiki-image-hierarchy].
+
 ### Git Hub subfolders / Docker image sets
 
 #### [xubuntu-vnc][this-github-xubuntu-vnc]
@@ -80,7 +82,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-chromium/README.md

@@ -14,6 +14,8 @@ This image adds the current version of the open-source [Chromium][chromium] web
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -68,7 +70,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-firefox/README.md

@@ -16,6 +16,8 @@ This image adds the current version of [Firefox Quantum][firefox] web browser an
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -145,7 +147,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-heroku/Dockerfile.js.heroku

@@ -1,8 +1,8 @@
-# docker build -f Dockerfile.js.heroku -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql .
-# docker build -f Dockerfile.js.heroku -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:dfw .
-# docker build -f Dockerfile.js.heroku --build-arg BASETAG=firefox -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:firefox .
-# docker build -f Dockerfile.js.heroku --build-arg BASETAG=chromium -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:chromium .
-# docker build -f Dockerfile.js.heroku --build-arg BASETAG=lab -t accetto/accetto/xubuntu-vnc-js-heroku-postgresql:lab .
+# docker build -f Dockerfile.js.heroku -t accetto/xubuntu-vnc-js-heroku-postgresql .
+# docker build -f Dockerfile.js.heroku --build-arg BASETAG=dev -t accetto/xubuntu-vnc-js-heroku-postgresql:dfw .
+# docker build -f Dockerfile.js.heroku --build-arg BASETAG=firefox -t accetto/xubuntu-vnc-js-heroku-postgresql:firefox .
+# docker build -f Dockerfile.js.heroku --build-arg BASETAG=chromium -t accetto/xubuntu-vnc-js-heroku-postgresql:chromium .
+# docker build -f Dockerfile.js.heroku --build-arg BASETAG=lab -t accetto/xubuntu-vnc-js-heroku-postgresql:lab .
 
 ARG BASETAG=latest
 
@@ -36,6 +36,8 @@ RUN /dockerstartup/set_user_permissions.sh ${HOME}
 
 FROM stage-postgresql as stage-final
 
-ENV REFRESHED_AT 2019-08-11
+ARG ARG_REFRESHED_AT
+
+ENV REFRESHED_AT=${ARG_REFRESHED_AT}
 
 USER 1001

docker/xubuntu-vnc-heroku/README.md

@@ -28,6 +28,8 @@ The included features allow, for example, to complete the whole tutorial [Gettin
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -54,15 +56,7 @@ The [Git Hub][this-github-xubuntu-vnc-heroku] repository contains several Docker
 
   This is the main Dockerfile for building the `latest` image tag based on the `accetto/xubuntu-vnc-typescript:latest` tag by default.
 
-  However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc-typescript:lab`.
-
-- `Dockerfile.js.heroku.firefox`  
-
-  This Dockerfile is for building the `firefox` image tag, which is based on the `accetto/xubuntu-vnc-typescript:firefox` tag and therefore includes also [Firefox][firefox] web browser and the **plus** features
-
-- `Dockerfile.js.heroku.chromium`  
-
-  This Dockerfile is for building the `chromium` image tag, which is based on the `accetto/xubuntu-vnc-typescript:chromium` tag and therefore includes also [Chromium][chromium] web browser
+  However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc-typescript:firefox`. The `firefox` and `chromium` tags are built that way.
 
 ### Ports
 
@@ -117,7 +111,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-heroku/hooks/build

@@ -0,0 +1,14 @@
+#!/bin/bash -xe
+
+. ./hooks/env
+
+if [[ -n "$BASETAG" ]] ; then
+
+    docker build \
+        -f $DOCKERFILE_PATH \
+            --build-arg BASETAG="$BASETAG" \
+            --build-arg ARG_REFRESHED_AT="$TODAY" \
+        -t $DOCKER_REPO:$DOCKER_TAG .
+else
+    echo "Build request not recognized: $SOURCE_BRANCH"
+fi

docker/xubuntu-vnc-heroku/hooks/env

@@ -0,0 +1,38 @@
+### hooks/env
+
+ARCHIVE_TAG="ubuntu18.04.3-node10.16.3-npm6.9.0-code1.37.1-tsc3.5.3-heroku7.29.0-psql10.10"
+ARCHIVE_TAG_FIREFOX="ubuntu18.04.3-node10.16.3-npm6.9.0-code1.37.1-tsc3.5.3-heroku7.29.0-psql10.10-firefox68.0.2"
+ARCHIVE_TAG_CHROMIUM="ubuntu18.04.3-node10.16.3-npm6.9.0-code1.37.1-tsc3.5.3-heroku7.29.0-psql10.10-chromium76.0.3809.100"
+TODAY=$(date +%Y-%m-%d)
+BASETAG=""
+
+case "$DOCKER_TAG" in
+
+    latest)
+        BASETAG="latest"
+        ;;
+
+    chromium)
+        BASETAG="chromium"
+        ;;
+
+    firefox)
+        BASETAG="firefox"
+        ;;
+
+    dev)
+        BASETAG="dev"
+        ;;
+
+    dev-chromium)
+        BASETAG="dev-chromium"
+        ;;
+
+    dev-firefox)
+        BASETAG="dev-firefox"
+        ;;
+
+    *)
+        BASETAG=""
+        ;;
+esac

docker/xubuntu-vnc-heroku/hooks/push

@@ -0,0 +1,26 @@
+#!/bin/bash -xe
+
+. ./hooks/env
+
+if [[ -n "$BASETAG" ]] ; then
+
+    docker push $DOCKER_REPO:$DOCKER_TAG
+
+    case "$DOCKER_TAG" in
+        latest)
+            docker tag $IMAGE_NAME $DOCKER_REPO:$ARCHIVE_TAG
+            docker push $DOCKER_REPO:$ARCHIVE_TAG
+            ;;
+        chromium)
+            docker tag $IMAGE_NAME $DOCKER_REPO:$ARCHIVE_TAG_CHROMIUM
+            docker push $DOCKER_REPO:$ARCHIVE_TAG_CHROMIUM
+            ;;
+        firefox)
+            docker tag $IMAGE_NAME $DOCKER_REPO:$ARCHIVE_TAG_FIREFOX
+            docker push $DOCKER_REPO:$ARCHIVE_TAG_FIREFOX
+            ;;
+    esac
+else
+    echo "Nothing to push!"
+    exit 1
+fi

docker/xubuntu-vnc-inkscape/README.md

@@ -14,6 +14,8 @@ This image adds the current version of the free professional vector graphics edi
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -74,7 +76,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-inkscape/hooks/env

@@ -15,7 +15,7 @@ case "$DOCKER_TAG" in
 
     firefox)
         BASEIMAGE="accetto/xubuntu-vnc-firefox"
-        BASETAG="firefox"
+        BASETAG="latest"
         ;;
 
     dev)

docker/xubuntu-vnc-node/README.md

@@ -19,6 +19,8 @@ This image adds the following components:
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -140,7 +142,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc-node/hooks/env

@@ -16,12 +16,12 @@ case "$DOCKER_TAG" in
 
     chromium)
         BASEIMAGE="accetto/xubuntu-vnc-chromium"
-        BASETAG="chromium"
+        BASETAG="latest"
         ;;
 
     firefox)
         BASEIMAGE="accetto/xubuntu-vnc-firefox"
-        BASETAG="firefox"
+        BASETAG="latest"
         ;;
 
     dev)

docker/xubuntu-vnc-typescript/README.md

@@ -24,6 +24,8 @@ and adds the following ones:
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -105,7 +107,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 

docker/xubuntu-vnc/README.md

@@ -23,6 +23,8 @@ The main features and components of the images are:
 
 The history of notable changes is documented in the [CHANGELOG][this-changelog].
 
+The project's complete [image hierarchy][this-wiki-image-hierarchy] is illustrated in Wiki.
+
 ![container-screenshot][this-screenshot-container]
 
 ### Image tags
@@ -202,7 +204,9 @@ Credit goes to all the countless people and companies, who contribute to open so
 [this-docker]: https://hub.docker.com/r/accetto/xubuntu-vnc/
 [this-github]: https://github.com/accetto/xubuntu-vnc/
 [this-changelog]: https://github.com/accetto/xubuntu-vnc/blob/master/CHANGELOG.md
+
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
+[this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues