Release 19.12.2

accetto · Dec 30, 2019 · 5179006 · 5179006
2 parents f2f6f8d + fd6ccd9
commit 5179006
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,11 +11,15 @@
 - **xubuntu-vnc-novnc**
   - **TigerVNC** version **1.10.1**
     - version still incorrectly reported as **1.10.0** (see [issue #925](https://github.com/TigerVNC/tigervnc/issues/925))
-  - **vnc_startup.sh** and some other session related stuff updated
-  - **Dockerfile** updated
   - **VNC_RESOLUTION** default value changed to **1360x768**
   - bottom desktop panel (panel 2) removed
-- all other images inherited the above changes
+  - **xfce4-screenshooter** added (version **1.8.2** from Ubuntu distribution)
+  - image viewer **Ristretto** added (version **0.8.2** from Ubuntu distribution)
+  - updated files:
+    - **Dockerfile**
+    - **vnc_startup.sh** and some other session related stuff
+    - **version_of.sh** and **version_sticker.sh**
+- all other images inherit the above changes
 
 ### Release 19.12.1
 

diff --git a/docker/xubuntu-vnc-novnc-chromium/README.md b/docker/xubuntu-vnc-novnc-chromium/README.md
@@ -25,6 +25,7 @@ The `latest` image inherits among others
 - current version of JSON processor [jq][jq]
 - popular text editor [vim][vim] (Ubuntu distribution)
 - lite but advanced graphical editor [mousepad][mousepad] (Ubuntu distribution)
+- [xfce4-screenshooter][screenshooter] and image viewer [ristretto][ristretto] (Ubuntu distribution)
 - current version of [tini][tini] as the entry-point initial process (PID 1)
 
 and adds
@@ -133,6 +134,8 @@ Credit goes to all the countless people and companies, who contribute to open so
 
 [mousepad]: https://github.com/codebrainz/mousepad
 [novnc]: https://github.com/kanaka/noVNC
+[ristretto]: https://docs.xfce.org/apps/ristretto/start
+[screenshooter]: https://docs.xfce.org/apps/screenshooter/start
 [tigervnc]: http://tigervnc.org
 [tightvnc]: http://www.tightvnc.com
 [tini]: https://github.com/krallin/tini

diff --git a/docker/xubuntu-vnc-novnc-chromium/src/startup/version_sticker.sh b/docker/xubuntu-vnc-novnc-chromium/src/startup/version_sticker.sh
@@ -11,6 +11,8 @@ case "$1" in
         ;;
     -V)
         mousepad=$("${STARTUPDIR}/version_of.sh" mousepad)
+        screenshooter=$("${STARTUPDIR}/version_of.sh" screenshooter)
+        ristretto=$("${STARTUPDIR}/version_of.sh" ristretto)
         vim=$("${STARTUPDIR}/version_of.sh" vim)
         tigervnc=$("${STARTUPDIR}/version_of.sh" tigervnc)
         novnc=$("${STARTUPDIR}/version_of.sh" novnc)
@@ -19,11 +21,13 @@ case "$1" in
         git=$("${STARTUPDIR}/version_of.sh" git)
         jq=$("${STARTUPDIR}/version_of.sh" jq)
         echo "Ubuntu $ubuntu"
-        echo "Mousepad $mousepad"
         echo "VIM $vim"
         echo "TigerVNC $tigervnc"
         echo "noVNC $novnc"
         echo "websockify $websockify"
+        echo "Mousepad $mousepad"
+        echo "Ristretto $ristretto"
+        echo "xfce4-screenshooter $screenshooter"
         echo "curl $curl"
         echo "Git $git"
         echo "jq $jq"

diff --git a/docker/xubuntu-vnc-novnc-chromium/xubuntu-vnc-novnc-chromium.jpg b/docker/xubuntu-vnc-novnc-chromium/xubuntu-vnc-novnc-chromium.jpg
diff --git a/docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox b/docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox
@@ -19,17 +19,6 @@ RUN apt-get update && apt-get install -y \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*
 
-### Alternatively install an explicit Firefox version
-### http://releases.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-US/firefox-67.0.4.tar.bz2
-# ENV \
-#     FIREFOX_VERSION=67.0.4 \
-#     FIREFOX_DISTRO=linux-x86_64 \
-#     FIREFOX_PATH=/usr/lib/firefox
-# RUN mkdir -p ${FIREFOX_PATH} \
-#     && wget -qO- http://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/${FIREFOX_DISTRO}/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 \
-#         | tar xvj -C /usr/lib/ \
-#     && ln -s ${FIREFOX_PATH}/firefox /usr/bin/firefox
-
 ### Preconfigure Xfce
 COPY [ "./src/firefox/home/Desktop", "${HOME}/Desktop/" ]
 COPY [ "./src/firefox/home/config/xfce4", "${HOME}/.config/xfce4/" ]

diff --git a/docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox.default b/docker/xubuntu-vnc-novnc-firefox/Dockerfile.firefox.default
@@ -17,17 +17,6 @@ RUN apt-get update && apt-get install -y \
     && apt-get -y autoremove \
     && rm -rf /var/lib/apt/lists/*
 
-### Alternatively install an explicit Firefox version
-### http://releases.mozilla.org/pub/firefox/releases/67.0.4/linux-x86_64/en-US/firefox-67.0.4.tar.bz2
-# ENV \
-#     FIREFOX_VERSION=67.0.4 \
-#     FIREFOX_DISTRO=linux-x86_64 \
-#     FIREFOX_PATH=/usr/lib/firefox
-# RUN mkdir -p ${FIREFOX_PATH} \
-#     && wget -qO- http://releases.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/${FIREFOX_DISTRO}/en-US/firefox-${FIREFOX_VERSION}.tar.bz2 \
-#         | tar xvj -C /usr/lib/ \
-#     && ln -s ${FIREFOX_PATH}/firefox /usr/bin/firefox
-
 ### Preconfigure Xfce
 COPY [ "./src/firefox/home/Desktop", "${HOME}/Desktop/" ]
 COPY [ "./src/firefox/home/config/xfce4", "${HOME}/.config/xfce4/" ]

diff --git a/docker/xubuntu-vnc-novnc-firefox/README.md b/docker/xubuntu-vnc-novnc-firefox/README.md
@@ -27,6 +27,7 @@ The `latest` image inherits among others
 - current version of JSON processor [jq][jq]
 - popular text editor [vim][vim] (Ubuntu distribution)
 - lite but advanced graphical editor [mousepad][mousepad] (Ubuntu distribution)
+- [xfce4-screenshooter][screenshooter] and image viewer [ristretto][ristretto] (Ubuntu distribution)
 - current version of [tini][tini] as the entry-point initial process (PID 1)
 
 and adds
@@ -220,6 +221,8 @@ Credit goes to all the countless people and companies, who contribute to open so
 [jq]: https://stedolan.github.io/jq/
 [mousepad]: https://github.com/codebrainz/mousepad
 [novnc]: https://github.com/kanaka/noVNC
+[ristretto]: https://docs.xfce.org/apps/ristretto/start
+[screenshooter]: https://docs.xfce.org/apps/screenshooter/start
 [tigervnc]: http://tigervnc.org
 [tightvnc]: http://www.tightvnc.com
 [tini]: https://github.com/krallin/tini

diff --git a/...nc-novnc-firefox/src/firefox/home/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/...nc-novnc-firefox/src/firefox/home/config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml
@@ -4,7 +4,6 @@
   <property name="configver" type="int" value="2"/>
   <property name="panels" type="array">
     <value type="int" value="1"/>
-    <value type="int" value="2"/>
     <property name="panel-1" type="empty">
       <property name="position" type="string" value="p=6;x=0;y=0"/>
       <property name="length" type="uint" value="100"/>
@@ -25,23 +24,6 @@
         <value type="int" value="2"/>
       </property>
     </property>
-    <property name="panel-2" type="empty">
-      <property name="position" type="string" value="p=10;x=0;y=0"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="7"/>
-        <value type="int" value="8"/>
-        <value type="int" value="9"/>
-        <value type="int" value="10"/>
-        <value type="int" value="20"/>
-        <value type="int" value="11"/>
-        <value type="int" value="22"/>
-        <value type="int" value="12"/>
-        <value type="int" value="13"/>
-        <value type="int" value="14"/>
-      </property>
-      <property name="autohide-behavior" type="uint" value="1"/>
-    </property>
   </property>
   <property name="plugins" type="empty">
     <property name="plugin-1" type="string" value="applicationsmenu"/>
@@ -54,36 +36,6 @@
     <property name="plugin-4" type="string" value="pager"/>
     <property name="plugin-5" type="string" value="clock"/>
     <property name="plugin-6" type="string" value="systray"/>
-    <property name="plugin-7" type="string" value="showdesktop"/>
-    <property name="plugin-8" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
-    </property>
-    <property name="plugin-9" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15413307241.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-10" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15413307242.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-11" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15413307243.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-12" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15413307244.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-13" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
-    </property>
-    <property name="plugin-14" type="string" value="directorymenu">
-      <property name="base-directory" type="string" value="/home/headless"/>
-    </property>
     <property name="plugin-16" type="string" value="launcher">
       <property name="items" type="array">
         <value type="string" value="15466801351.desktop"/>
@@ -104,20 +56,10 @@
         <value type="string" value="15563025961.desktop"/>
       </property>
     </property>
-    <property name="plugin-20" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15563026412.desktop"/>
-      </property>
-    </property>
     <property name="plugin-21" type="string" value="launcher">
       <property name="items" type="array">
         <value type="string" value="15564438881.desktop"/>
       </property>
     </property>
-    <property name="plugin-22" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="15564439112.desktop"/>
-      </property>
-    </property>
   </property>
 </channel>
diff --git a/docker/xubuntu-vnc-novnc-firefox/src/startup/version_sticker.sh b/docker/xubuntu-vnc-novnc-firefox/src/startup/version_sticker.sh
@@ -11,6 +11,8 @@ case "$1" in
         ;;
     -V)
         mousepad=$("${STARTUPDIR}/version_of.sh" mousepad)
+        screenshooter=$("${STARTUPDIR}/version_of.sh" screenshooter)
+        ristretto=$("${STARTUPDIR}/version_of.sh" ristretto)
         vim=$("${STARTUPDIR}/version_of.sh" vim)
         tigervnc=$("${STARTUPDIR}/version_of.sh" tigervnc)
         novnc=$("${STARTUPDIR}/version_of.sh" novnc)
@@ -19,11 +21,13 @@ case "$1" in
         git=$("${STARTUPDIR}/version_of.sh" git)
         jq=$("${STARTUPDIR}/version_of.sh" jq)
         echo "Ubuntu $ubuntu"
-        echo "Mousepad $mousepad"
         echo "VIM $vim"
         echo "TigerVNC $tigervnc"
         echo "noVNC $novnc"
         echo "websockify $websockify"
+        echo "Mousepad $mousepad"
+        echo "Ristretto $ristretto"
+        echo "xfce4-screenshooter $screenshooter"
         echo "curl $curl"
         echo "Git $git"
         echo "jq $jq"

diff --git a/docker/xubuntu-vnc-novnc-firefox/xubuntu-vnc-novnc-firefox.jpg b/docker/xubuntu-vnc-novnc-firefox/xubuntu-vnc-novnc-firefox.jpg
diff --git a/docker/xubuntu-vnc-novnc/Dockerfile b/docker/xubuntu-vnc-novnc/Dockerfile
@@ -74,11 +74,13 @@ ENV \
 
 ### 'apt-get clean' runs automatically
 RUN apt-get update && apt-get install -y \
-        mousepad \
         locales \
         supervisor \
         xfce4 \
         xfce4-terminal \
+        xfce4-screenshooter \
+        mousepad \
+        ristretto \
     && locale-gen en_US.UTF-8 \
     && apt-get purge -y \
         pm-utils \

diff --git a/docker/xubuntu-vnc-novnc/README.md b/docker/xubuntu-vnc-novnc/README.md
@@ -28,6 +28,7 @@ The main features and components of the images are:
 - current version of [noVNC][novnc] HTML5 clients (full and lite) (TCP port **6901**)
 - popular text editor [vim][vim] (Ubuntu distribution)
 - lite but advanced graphical editor [mousepad][mousepad] (Ubuntu distribution)
+- [xfce4-screenshooter][screenshooter] and image viewer [ristretto][ristretto] (Ubuntu distribution)
 - current version of [tini][tini] as the entry-point initial process (PID 1)
 - support for overriding both the container user account and its group
 - support of **version sticker** (see below)
@@ -50,7 +51,7 @@ The following image tags are regularly maintained and rebuilt:
     ![badge-VERSION_STICKER_LAB][badge-VERSION_STICKER_LAB]
     ![badge-github-commit-lab][badge-github-commit-lab]
 
-There are also archive images that are tagged like `ubuntu18.04.2` and similar. Those are previous production images and they can be useful for testing.
+There are also archive images that are tagged like `ubuntu18.04.3` and similar. Those are previous production images and they can be useful for testing.
 
 Sometimes you can also spot tags like `dev`, `lab-dev` and similar. Those are temporary images under development and they should not be used.
 
@@ -287,6 +288,8 @@ Credit goes to all the countless people and companies, who contribute to open so
 [jq]: https://stedolan.github.io/jq/
 [mousepad]: https://github.com/codebrainz/mousepad
 [novnc]: https://github.com/kanaka/noVNC
+[ristretto]: https://docs.xfce.org/apps/ristretto/start
+[screenshooter]: https://docs.xfce.org/apps/screenshooter/start
 [tigervnc]: http://tigervnc.org
 [tightvnc]: http://www.tightvnc.com
 [tini]: https://github.com/krallin/tini

diff --git a/docker/xubuntu-vnc-novnc/src/startup/version_of.sh b/docker/xubuntu-vnc-novnc/src/startup/version_of.sh
@@ -60,6 +60,10 @@ case "$1" in
         ### source example: psql (PostgreSQL) 10.10 (Ubuntu 10.10-0ubuntu0.18.04.1)
         echo $(psql --version 2>/dev/null | grep -Po '(?<=psql \(PostgreSQL\)\s)[0-9.]+')
         ;;
+    ristretto)
+        ### source example: ristretto 0.8.2
+        echo $(ristretto --version 2>/dev/null | grep -Po '[0-9.]+$')
+        ;;
     tigervnc | tiger-vnc | vncserver | vnc-server | vnc)
         ### source example: Xvnc TigerVNC 1.9.0 - built Jul 16 2018 14:18:04
         echo $(vncserver -version 2>/dev/null | grep -Po '(?<=Xvnc TigerVNC\s)[0-9.]+')
@@ -80,4 +84,8 @@ case "$1" in
         ### source example: 0.8.0
         echo $(cat "${NO_VNC_HOME}"/utils/websockify/CHANGES.txt 2>/dev/null | grep -Po -m1 '^[0-9.]+')
         ;;
+    xfce4-screenshooter | screenshooter | screenshot)
+        ### source example: xfce4-screenshooter 1.8.2
+        echo $(xfce4-screenshooter --version 2>/dev/null | grep -Po '[0-9.]+$')
+        ;;
 esac
diff --git a/docker/xubuntu-vnc-novnc/src/startup/version_sticker.sh b/docker/xubuntu-vnc-novnc/src/startup/version_sticker.sh
@@ -9,6 +9,8 @@ case "$1" in
         ;;
     -V)
         mousepad=$("${STARTUPDIR}/version_of.sh" mousepad)
+        screenshooter=$("${STARTUPDIR}/version_of.sh" screenshooter)
+        ristretto=$("${STARTUPDIR}/version_of.sh" ristretto)
         vim=$("${STARTUPDIR}/version_of.sh" vim)
         tigervnc=$("${STARTUPDIR}/version_of.sh" tigervnc)
         novnc=$("${STARTUPDIR}/version_of.sh" novnc)
@@ -17,11 +19,13 @@ case "$1" in
         git=$("${STARTUPDIR}/version_of.sh" git)
         jq=$("${STARTUPDIR}/version_of.sh" jq)
         echo "Ubuntu $ubuntu"
-        echo "Mousepad $mousepad"
         echo "VIM $vim"
         echo "TigerVNC $tigervnc"
         echo "noVNC $novnc"
         echo "websockify $websockify"
+        echo "Mousepad $mousepad"
+        echo "Ristretto $ristretto"
+        echo "xfce4-screenshooter $screenshooter"
         echo "curl $curl"
         echo "Git $git"
         echo "jq $jq"

diff --git a/docker/xubuntu-vnc-novnc/xubuntu-vnc-novnc.jpg b/docker/xubuntu-vnc-novnc/xubuntu-vnc-novnc.jpg