Release 21.02.2

CHANGELOG.md

@@ -6,6 +6,38 @@
 
 ***
 
+### Release 21.02.2
+
+- some optimizations in all Dockerfiles
+- **xubuntu-vnc-drawio**
+  - tag `firefox` will not be published any more
+- **xubuntu-vnc-gimp**
+  - tag `firefox` will not be published any more
+- **xubuntu-vnc-inkscape**
+  - tag `firefox` will not be published any more
+- **xubuntu-vnc-node**
+  - `Node.js` and `npm` installation has changed (more standard way)
+  - build argument **ARG_SAMPLES_DIR** has been added
+  - environment variable **SAMPLES_DIR** has been added
+  - samples home moved from `/usr/src` to `${SAMPLES_DIR}` (default `/usr/local/src/samples`)
+  - `EXPOSE ${NODE_PORT}` added to Dockerfile
+  - this changes are inherited by all derived images
+- **xubuntu-vnc-typescript**
+  - build argument **ARG_SAMPLES_DIR** has been added
+  - environment variable **SAMPLES_DIR** has been added
+- **xubuntu-vnc-heroku**
+  - build argument **ARG_SAMPLES_DIR** has been added
+  - environment variable **SAMPLES_DIR** has been added
+- **xubuntu-vnc-angular**
+  - build argument **ARG_SAMPLES_DIR** has been added
+  - environment variable **SAMPLES_DIR** has been added
+  - **angular** installed under non-root user (1001) now
+- Updated versions:
+  - Node.js `current` tag **15.9.0** (includes npm **7.5.3**)
+  - VSCode **1.53.2**
+  - TypeScript **4.1.5**
+  - Heroku **7.47.13**
+
 ### Release 21.02.1
 
 - Updated versions:

docker/xubuntu-vnc-angular/Dockerfile.angular

@@ -18,20 +18,29 @@ ARG BASETAG=latest
 
 FROM accetto/xubuntu-vnc-typescript:${BASETAG} as stage-angular
 
-USER 0
+ARG ARG_SAMPLES_DIR
 
-ENV NG_CLI_ANALYTICS=false
+USER 0
 
-RUN npm install -g @angular/cli
+ENV \
+    NG_CLI_ANALYTICS=false \
+    SAMPLES_DIR=${ARG_SAMPLES_DIR:-/usr/local/src/samples}
 
 COPY [ "./src/startup/version_sticker.sh", "${STARTUPDIR}/" ]
 
+WORKDIR "${SAMPLES_DIR}"
+
 ### Fix permissions
 ### Don't break building, setting permissions takes quite a while.
 RUN \
-    chmod a+wx "${STARTUPDIR}"/version_sticker.sh \
+    chmod -R g+w "${SAMPLES_DIR}" \
+    && chmod a+wx "${STARTUPDIR}"/version_sticker.sh \
     && "${STARTUPDIR}"/set_user_permissions.sh "${STARTUPDIR}" "${HOME}"
 
+USER 1001
+
+RUN npm install -g @angular/cli
+
 FROM stage-angular as stage-final
 
 ARG ARG_REFRESHED_AT

docker/xubuntu-vnc-angular/README.md

@@ -133,16 +133,18 @@ The containers do not create or use any external volumes by default. However, th
 
 Both **named volumes** and **bind mounts** can be used. More about volumes can be found in the [Docker documentation][docker-doc] (e.g. [Manage data in Docker][docker-doc-managing-data]).
 
-The folder `/usr/src` is intended as the working folder for development and it should be mounted to an external volume or folder if you want to keep the projects outside the container.
+The folder `/usr/local/src/samples` is intended as the working folder for development and it should be mounted to an external volume or folder if you want to keep the projects outside the container.
+
+The working folder can be changed through the build argument `ARG_SAMPLES_DIR`. The path is also available to scripts through the environment variable `SAMPLES_DIR`.
 
 For example, the following container would use the local folder **my_apps**:
 
 ```shell
-docker run -dP -v /my_apps:/usr/src accetto/xubuntu-vnc-angular
+docker run -dP -v /my_apps:/usr/local/src/samples accetto/xubuntu-vnc-angular
 
 # or using the newer syntax
 
-docker run -dP --mount source=/my_apps,target=/usr/src accetto/xubuntu-vnc-angular
+docker run -dP --mount source=/my_apps,target=/usr/local/src/samples accetto/xubuntu-vnc-angular
 ```
 
 ### Container user

docker/xubuntu-vnc-angular/hooks/env

@@ -12,9 +12,9 @@ TODAY=$(date +%Y-%m-%d)
 VERSION_STICKER=""
 
 ### Warning! The values must be explicit strings (used by utils).
-VERSION_STICKER_LATEST="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.1-tsc4.1.4-angular11.1.4"
-VERSION_STICKER_CHROMIUM="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.1-tsc4.1.4-angular11.1.4-chromium87.0.4280.66"
-VERSION_STICKER_FIREFOX="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.1-tsc4.1.4-angular11.1.4-firefox85.0.1"
+VERSION_STICKER_LATEST="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.2-tsc4.1.5-angular11.2.1"
+VERSION_STICKER_CHROMIUM="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.2-tsc4.1.5-angular11.2.1-chromium87.0.4280.66"
+VERSION_STICKER_FIREFOX="ubuntu18.04.5-node14.15.5-npm6.14.11-code1.53.2-tsc4.1.5-angular11.2.1-firefox85.0.1"
 
 case "${DOCKER_TAG}" in
 

docker/xubuntu-vnc-angular/src/startup/version_sticker.sh

@@ -32,6 +32,8 @@ case "$1" in
         gdebi=$("${STARTUPDIR}/version_of.sh" gdebi)
         git=$("${STARTUPDIR}/version_of.sh" git)
         jq=$("${STARTUPDIR}/version_of.sh" jq)
+        fakeroot=$("${STARTUPDIR}/version_of.sh" fakeroot)
+        rpm=$("${STARTUPDIR}/version_of.sh" rpm)
         echo "Ubuntu $ubuntu"
         echo "VIM $vim"
         echo "GNU nano $nano"
@@ -43,6 +45,8 @@ case "$1" in
         echo "gdebi $gdebi"
         echo "Git $git"
         echo "jq $jq"
+        echo "fakeroot $fakeroot"
+        echo "RPM $rpm"
         echo "Node $node"
         echo "npm $npm"
         echo "VSCode $code"

docker/xubuntu-vnc-chromium/Dockerfile.chromium

@@ -22,7 +22,8 @@ FROM accetto/xubuntu-vnc:${BASETAG} as stage-chromium
 USER 0
 
 ### 'apt-get clean' runs automatically
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         chromium-browser \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*

docker/xubuntu-vnc-drawio/Dockerfile.drawio

@@ -25,11 +25,11 @@ USER 0
 
 ### install current version explicitly
 ### https://github.com/jgraph/drawio-desktop/releases/download/v12.2.2/draw.io-amd64-12.2.2.deb
-ENV \
-    DRAWIO_VERSION="${ARG_DRAWIO_VERSION}"
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         xdg-utils \
         libappindicator3-1 \
+    && DRAWIO_VERSION="${ARG_DRAWIO_VERSION}" \
     && wget -q "https://github.com/jgraph/drawio-desktop/releases/download/v${DRAWIO_VERSION}/draw.io-amd64-${DRAWIO_VERSION}.deb" \
         && dpkg -i draw.io-amd64-${DRAWIO_VERSION}.deb \
         && apt-get -y -f install \

docker/xubuntu-vnc-drawio/README.md

@@ -13,12 +13,6 @@
 
 ***
 
-**WARNING** about images with Firefox
-
-Starting from the release **20.10.1**, there is no single-process Firefox image and the multi-process mode is always enabled. Be aware, that multi-process requires larger shared memory (`/dev/shm`). At least 256MB is recommended. Please check the [Firefox multi-process][that-wiki-firefox-multiprocess] page in Wiki for more information and the instructions, how to set the shared memory size in different scenarios.
-
-***
-
 This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc] server for headless use and the free open-source [desktop version][drawio-desktop] of the diagramming tool [draw.io][drawio].
 
 The images are part of the growing [image hierarchy][this-wiki-image-hierarchy] and they are based on [accetto/xubuntu-vnc][accetto-docker-xubuntu-vnc]. They inherit all the features and therefore not the whole description will be repeated here.
@@ -58,11 +52,6 @@ The following image tags are regularly maintained and rebuilt:
     ![badge-VERSION_STICKER_LATEST][badge-VERSION_STICKER_LATEST]
     ![badge-github-commit-latest][badge-github-commit-latest]
 
-- `firefox` is based on `accetto/xubuntu-vnc-firefox:latest` and it includes also [Firefox][firefox] web browser and the **plus** features. Be aware that Firefox uses multi-process and therefore requires larger shared memory. See the [Firefox multi-process][this-wiki-firefox-multiprocess] page in Wiki for more information and the instructions, how to set the shared memory size in different scenarios.
-
-    ![badge-VERSION_STICKER_FIREFOX][badge-VERSION_STICKER_FIREFOX]
-    ![badge-github-commit-firefox][badge-github-commit-firefox]
-
 ### Dockerfiles
 
 The [Git Hub][this-github-xubuntu-vnc-drawio] repository contains several Dockerfiles that can be used to build the images.
@@ -73,7 +62,7 @@ The [Git Hub][this-github-xubuntu-vnc-drawio] repository contains several Docker
 
   However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc:lab`.
 
-  By providing the `BASEIMAGE` build argument it is possible to build images based on other base  images, for example `accetto/xubuntu-vnc-firefox`. The `firefox` tag is built that way.
+  By providing the `BASEIMAGE` build argument it is possible to build images based on other base  images, for example `accetto/xubuntu-vnc-firefox`.
 
 ### Ports
 
@@ -130,7 +119,6 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
 [this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
-[this-wiki-firefox-multiprocess]: https://github.com/accetto/xubuntu-vnc/wiki/Firefox-multiprocess
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 
@@ -150,7 +138,6 @@ Credit goes to all the countless people and companies, who contribute to open so
 [drawio-desktop]: https://github.com/jgraph/drawio-desktop/
 [git]: https://git-scm.com/
 [jq]: https://stedolan.github.io/jq/
-[firefox]: https://www.mozilla.org
 [mousepad]: https://github.com/codebrainz/mousepad
 [nano]: https://www.nano-editor.org/
 [ristretto]: https://docs.xfce.org/apps/ristretto/start
@@ -178,9 +165,3 @@ Credit goes to all the countless people and companies, who contribute to open so
 [badge-VERSION_STICKER_LATEST]: https://badgen.net/badge/version%20sticker/ubuntu18.04.5-drawio14.1.8/blue
 
 [badge-github-commit-latest]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-drawio.svg
-
-<!-- firefox tag badges -->
-
-[badge-VERSION_STICKER_FIREFOX]: https://badgen.net/badge/version%20sticker/ubuntu18.04.5-drawio14.1.8-firefox85.0.1/blue
-
-[badge-github-commit-firefox]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-drawio:firefox.svg

docker/xubuntu-vnc-drawio/hooks/env

@@ -16,17 +16,17 @@ DRAWIO_VERSION="14.1.8"
 
 ### Warning! The values must be explicit strings (used by utils).
 VERSION_STICKER_LATEST="ubuntu18.04.5-drawio14.1.8"
-VERSION_STICKER_FIREFOX="ubuntu18.04.5-drawio14.1.8-firefox85.0.1"
+# VERSION_STICKER_FIREFOX="ubuntu18.04.5-drawio14.1.8-firefox85.0.1"
 
 case "${DOCKER_TAG}" in
 
     latest | dev )
         VERSION_STICKER="${VERSION_STICKER_LATEST}"
         ;;
 
-    firefox | dev-firefox )
-        VERSION_STICKER="${VERSION_STICKER_FIREFOX}"
-        ;; 
+    # firefox | dev-firefox )
+    #     VERSION_STICKER="${VERSION_STICKER_FIREFOX}"
+    #     ;; 
 esac
 
 case "${DOCKER_TAG}" in
@@ -36,20 +36,20 @@ case "${DOCKER_TAG}" in
         BASETAG="latest"
         ;;
 
-    firefox)
-        BASEIMAGE="accetto/xubuntu-vnc-firefox"
-        BASETAG="latest"
-        ;;
+    # firefox)
+    #     BASEIMAGE="accetto/xubuntu-vnc-firefox"
+    #     BASETAG="latest"
+    #     ;;
 
     dev)
         BASEIMAGE="accetto/xubuntu-vnc"
         BASETAG="dev"
         ;;
 
-    dev-firefox)
-        BASEIMAGE="accetto/xubuntu-vnc-firefox"
-        BASETAG="dev"
-        ;;
+    # dev-firefox)
+    #     BASEIMAGE="accetto/xubuntu-vnc-firefox"
+    #     BASETAG="dev"
+    #     ;;
 
     *)
         BASETAG=""

docker/xubuntu-vnc-firefox/Dockerfile.firefox

@@ -22,7 +22,8 @@ FROM accetto/xubuntu-vnc:${BASETAG} as stage-firefox
 USER 0
 
 ### 'apt-get clean' runs automatically
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         firefox \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*

docker/xubuntu-vnc-firefox/Dockerfile.firefox.default

@@ -22,7 +22,8 @@ FROM accetto/xubuntu-vnc:${BASETAG} as stage-firefox
 USER 0
 
 ### 'apt-get clean' runs automatically
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         firefox \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*

docker/xubuntu-vnc-gimp/Dockerfile.gimp

@@ -23,7 +23,8 @@ FROM ${BASEIMAGE}:${BASETAG} as stage-gimp
 USER 0
 
 ### 'apt-get clean' runs automatically
-RUN apt-get update && apt-get install -y \
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y \
         gimp \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*

docker/xubuntu-vnc-gimp/README.md

@@ -13,12 +13,6 @@
 
 ***
 
-**WARNING** about images with Firefox
-
-Starting from the release **20.10.1**, there is no single-process Firefox image and the multi-process mode is always enabled. Be aware, that multi-process requires larger shared memory (`/dev/shm`). At least 256MB is recommended. Please check the [Firefox multi-process][that-wiki-firefox-multiprocess] page in Wiki for more information and the instructions, how to set the shared memory size in different scenarios.
-
-***
-
 This repository contains resources for building Docker images based on [Ubuntu][docker-ubuntu] with [Xfce][xfce] desktop environment, [VNC][tigervnc] server for headless use and the free open-source bitmap image editor [GIMP][gimp].
 
 The images are part of the growing [image hierarchy][this-wiki-image-hierarchy] and they are based on [accetto/xubuntu-vnc][accetto-docker-xubuntu-vnc]. They inherit all the features and therefore not the whole description will be repeated here.
@@ -50,11 +44,6 @@ The following image tags are regularly maintained and rebuilt:
     ![badge-VERSION_STICKER_LATEST][badge-VERSION_STICKER_LATEST]
     ![badge-github-commit-latest][badge-github-commit-latest]
 
-- `firefox` is based on `accetto/xubuntu-vnc-firefox:latest` and it includes also [Firefox][firefox] web browser and the **plus** features. Be aware that Firefox uses multi-process and therefore requires larger shared memory. See the [Firefox multi-process][this-wiki-firefox-multiprocess] page in Wiki for more information and the instructions, how to set the shared memory size in different scenarios.
-
-    ![badge-VERSION_STICKER_FIREFOX][badge-VERSION_STICKER_FIREFOX]
-    ![badge-github-commit-firefox][badge-github-commit-firefox]
-
 ### Dockerfiles
 
 The [Git Hub][this-github-xubuntu-vnc-gimp] repository contains several Dockerfiles that can be used to build the images.
@@ -65,7 +54,7 @@ The [Git Hub][this-github-xubuntu-vnc-gimp] repository contains several Dockerfi
 
   However, by providing the `BASETAG` build argument it is possible to build images based on other base tags, for example `accetto/xubuntu-vnc:lab`.
 
-  By providing the `BASEIMAGE` build argument it is possible to build images based on other base  images, for example `accetto/xubuntu-vnc-firefox`. The `firefox` tag is built that way.
+  By providing the `BASEIMAGE` build argument it is possible to build images based on other base  images, for example `accetto/xubuntu-vnc-firefox`.
 
 ### Ports
 
@@ -122,7 +111,6 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [this-wiki]: https://github.com/accetto/xubuntu-vnc/wiki
 [this-wiki-image-hierarchy]: https://github.com/accetto/xubuntu-vnc/wiki/Image-hierarchy
-[this-wiki-firefox-multiprocess]: https://github.com/accetto/xubuntu-vnc/wiki/Firefox-multiprocess
 
 [this-issues]: https://github.com/accetto/xubuntu-vnc/issues
 
@@ -140,7 +128,6 @@ Credit goes to all the countless people and companies, who contribute to open so
 [curl]: http://manpages.ubuntu.com/manpages/bionic/man1/curl.1.html
 [git]: https://git-scm.com/
 [jq]: https://stedolan.github.io/jq/
-[firefox]: https://www.mozilla.org
 [gimp]: https://www.gimp.org/
 [mousepad]: https://github.com/codebrainz/mousepad
 [nano]: https://www.nano-editor.org/
@@ -169,9 +156,3 @@ Credit goes to all the countless people and companies, who contribute to open so
 [badge-VERSION_STICKER_LATEST]: https://badgen.net/badge/version%20sticker/ubuntu18.04.5-gimp2.8.22/blue
 
 [badge-github-commit-latest]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-gimp.svg
-
-<!-- firefox tag badges -->
-
-[badge-VERSION_STICKER_FIREFOX]: https://badgen.net/badge/version%20sticker/ubuntu18.04.5-gimp2.8.22-firefox85.0.1/blue
-
-[badge-github-commit-firefox]: https://images.microbadger.com/badges/commit/accetto/xubuntu-vnc-gimp:firefox.svg