Skip to content

Commit

Permalink
Set image tag as 18.04
Browse files Browse the repository at this point in the history
On ubuntu:18.04 there is not a non-root "ubuntu" user
  • Loading branch information
rubensa committed Sep 23, 2024
1 parent c445037 commit cab6ee9
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ jobs:
with:
DOCKER_REPOSITORY_NAME: rubensa
DOCKER_IMAGE_NAME: ubuntu-tini-user
DOCKER_IMAGE_TAG: latest
DOCKER_IMAGE_TAG: 18.04
secrets: inherit
13 changes: 1 addition & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rubensa/ubuntu-tini
FROM rubensa/ubuntu-tini:18.04
LABEL author="Ruben Suarez <[email protected]>"

# Architecture component of TARGETPLATFORM (platform of the build result)
Expand All @@ -16,17 +16,6 @@ ARG GROUP_NAME=group
ENV USER_NAME=${USER_NAME}
ENV GROUP_NAME=${GROUP_NAME}

# Since ubuntu:23.04 a non-root "ubuntu" user is created by default with UID=1000
# Let's remove it to avoid conflicts
RUN echo "# Removing default 'ubuntu' user..." \
#
# avoid "userdel: ubuntu mail spool (/var/mail/ubuntu) not found" warning
&& touch /var/mail/ubuntu \
&& chown ubuntu /var/mail/ubuntu \
#
# remove user
&& userdel -r ubuntu

# Create a non-root user with custom group
RUN echo "# Creating group '${GROUP_NAME}' (${GROUP_ID})..." \
&& groupadd --gid ${GROUP_ID} ${GROUP_NAME} \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Docker image based on rubensa/ubuntu-tini with non root user support
# Docker image based on rubensa/ubuntu-tini 18.04 with non root user support

This is a Docker image based on [rubensa/ubuntu-tini](https://github.com/rubensa/docker-ubuntu-tini) that allows you to connect and run with a non-root user created inside the image.

Expand All @@ -13,7 +13,7 @@ You can build the image like this:
DOCKER_REPOSITORY_NAME="rubensa"
DOCKER_IMAGE_NAME="ubuntu-tini-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.04"
docker buildx build --platform=linux/amd64,linux/arm64 --no-cache \
-t "${DOCKER_REPOSITORY_NAME}/${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" \
Expand All @@ -32,7 +32,7 @@ You can also add build image args to change default non-root user (user:1000) an
DOCKER_REPOSITORY_NAME="rubensa"
DOCKER_IMAGE_NAME="ubuntu-tini-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.04"
# Get current user UID
USER_ID=$(id -u)
Expand Down Expand Up @@ -76,7 +76,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-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.04"
# Get current user UID
USER_ID=$(id -u)
Expand Down
2 changes: 1 addition & 1 deletion build-custom.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-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.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-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.04"

# see: https://github.com/docker/buildx/issues/495#issuecomment-761562905
#docker buildx build --platform=linux/amd64,linux/arm64 --no-cache --progress=plain --pull \
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-user"
DOCKER_IMAGE_TAG="latest"
DOCKER_IMAGE_TAG="18.04"

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

0 comments on commit cab6ee9

Please sign in to comment.