Set image tag as 18.04

Use deluge-team ppa (no need to install python3-setuptools)
Use obsproject ppa
No need to use mozillateam ppa for thunderbird (as deb is available in Ubuntu repos)

.github/workflows/main.yml

@@ -17,7 +17,7 @@ jobs:
     with:
       DOCKER_REPOSITORY_NAME: rubensa
       DOCKER_IMAGE_NAME: ubuntu-tini-desktop
-      DOCKER_IMAGE_TAG: latest
+      DOCKER_IMAGE_TAG: 18.04
       DOCKER_IMAGE_PLATFORMS: "linux/amd64"
       FREE_RUNNER_DISK_SPACE_BEFORE_BUILD: true
     secrets: inherit

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.4
-FROM rubensa/ubuntu-tini-x11
+FROM rubensa/ubuntu-tini-x11:18.04
 LABEL author="Ruben Suarez <[email protected]>"
 
 # Tell docker that all future commands should be run as root
@@ -34,10 +34,14 @@ apt-get -y install --no-install-recommends google-chrome-stable 2>&1
 EOT
 
 # Install deluge dependencies
-RUN apt-get -y install --no-install-recommends software-properties-common python3-setuptools 2>&1
+RUN apt-get -y install --no-install-recommends software-properties-common 2>&1
 # Add Deluge
 RUN <<EOT
 echo "# Installing deluge..."
+#
+# Add Deluge repo
+add-apt-repository -y ppa:deluge-team/stable
+apt-get update
 apt-get -y install --no-install-recommends deluge 2>&1
 EOT
 
@@ -134,11 +138,6 @@ EOT
 # Add Thunderbird
 RUN <<EOT
 echo "# Installing thunderbird..."
-#
-# Add Thunderbird repo
-add-apt-repository -y ppa:mozillateam/ppa
-printf "Package: thunderbird*\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001\n" >> /etc/apt/preferences.d/mozillateamppa
-apt-get update
 apt-get -y install --no-install-recommends thunderbird 2>&1
 EOT
 
@@ -176,6 +175,10 @@ RUN apt-get -y install --no-install-recommends software-properties-common v4l2lo
 # Add OBS Studio
 RUN <<EOT
 echo "# Installing OBS Studio..."
+#
+# Add OBS Studio repo
+add-apt-repository ppa:obsproject/obs-studio
+apt-get update
 apt-get -y install --no-install-recommends obs-studio 2>&1
 EOT
 

README.md

@@ -1,6 +1,6 @@
 # Docker image with some GUI apps
 
-This is a Docker image based on [rubensa/ubuntu-tini-x11](https://github.com/rubensa/docker-ubuntu-tini-x11) and includes some GUI applications.
+This is a Docker image based on [rubensa/ubuntu-tini-x11](https://github.com/rubensa/docker-ubuntu-tini-x11) 18.04 and includes some GUI applications.
 
 ## Building
 
@@ -11,7 +11,7 @@ You can build the image like this:
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="18.04"
 
 docker build --no-cache \
   -t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
@@ -28,7 +28,7 @@ You can run the container like this (change --rm with -d if you don't want the c
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="18.04"
 
 # Get current user UID
 USER_ID=$(id -u)

build.sh

@@ -2,7 +2,7 @@
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="18.04"
 
 docker build --no-cache \
   -t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \

run.sh

@@ -2,7 +2,7 @@
 
 DOCKER_REPOSITORY_NAME="rubensa"
 DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
-DOCKER_IMAGE_TAG="latest"
+DOCKER_IMAGE_TAG="18.04"
 
 # Get current user UID
 USER_ID=$(id -u)