Skip to content

Commit

Permalink
Set image tag as 20.04
Browse files Browse the repository at this point in the history
Use deluge-team ppa
Use obsproject ppa
  • Loading branch information
rubensa committed Jul 12, 2024
1 parent 039556f commit ad415ff
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
DOCKER_REPOSITORY_NAME: rubensa
DOCKER_IMAGE_NAME: ubuntu-tini-desktop
DOCKER_IMAGE_TAG: latest
DOCKER_IMAGE_TAG: 20.04
DOCKER_IMAGE_PLATFORMS: "linux/amd64"
FREE_RUNNER_DISK_SPACE_BEFORE_BUILD: true
secrets: inherit
12 changes: 9 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rubensa/ubuntu-tini-x11
FROM rubensa/ubuntu-tini-x11:20.04
LABEL author="Ruben Suarez <rubensa@gmail.com>"

# Tell docker that all future commands should be run as root
Expand Down Expand Up @@ -31,7 +31,10 @@ RUN mkdir -p /etc/apt/keyrings/ \
RUN apt-get -y install --no-install-recommends software-properties-common 2>&1
# Add Deluge
RUN echo "# Installing deluge..." \
&& apt-get -y install --no-install-recommends deluge 2>&1
#
# Add Deluge repo
&& add-apt-repository -y ppa:deluge-team/stable \
&& apt-get update && apt-get -y install --no-install-recommends deluge 2>&1

# Install Appimage and draw.io dependencies
RUN apt-get -y install --no-install-recommends fuse libfuse2 libnss3 2>&1
Expand Down Expand Up @@ -143,7 +146,10 @@ RUN echo "# Installing Discord..." \
RUN apt-get -y install --no-install-recommends software-properties-common v4l2loopback-dkms 2>&1
# Add OBS Studio
RUN echo "# Installing OBS Studio..." \
&& apt-get -y install --no-install-recommends obs-studio 2>&1;
#
# 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;

# Clean up apt
RUN apt-get autoremove -y \
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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) 20.04 and includes some GUI applications.

## Building

Expand All @@ -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="20.04"
docker build --no-cache \
-t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
Expand All @@ -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="20.04"
# Get current user UID
USER_ID=$(id -u)
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_REPOSITORY_NAME="rubensa"
DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="20.04"

docker build --no-cache \
-t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
Expand Down
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

DOCKER_REPOSITORY_NAME="rubensa"
DOCKER_IMAGE_NAME="ubuntu-tini-desktop"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="20.04"

# Get current user UID
USER_ID=$(id -u)
Expand Down

0 comments on commit ad415ff

Please sign in to comment.