From c218675644651b780cee0d2e37ecbbb18ef5fce4 Mon Sep 17 00:00:00 2001
From: Ruben Suarez <rubensa@gmail.com>
Date: Sun, 7 Jun 2020 15:03:54 +0200
Subject: [PATCH] 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 |  2 +-
 Dockerfile                 | 17 ++++++++++-------
 README.md                  |  6 +++---
 build.sh                   |  2 +-
 run.sh                     |  2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index cdacbe0..0a6e7dd 100644
--- a/.github/workflows/main.yml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index ff7764f..a5e5dcf 100644
--- a/Dockerfile
+++ b/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 <rubensa@gmail.com>"
 
 # 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
 
diff --git a/README.md b/README.md
index 42c7de1..52be0c3 100644
--- a/README.md
+++ b/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)
diff --git a/build.sh b/build.sh
index af1b7b4..a7cebfe 100755
--- a/build.sh
+++ b/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}" \
diff --git a/run.sh b/run.sh
index e314f46..c551025 100755
--- a/run.sh
+++ b/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)