ipng/gitea-debian-runner
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ubuntu-24.04 (#133)

Browse Source 
* add ubuntu-24.04

* Different workaround for default user/group in 24.04 (#137)

---------

Co-authored-by: Bob Vandevliet <info@bvandevliet.nl>
This commit is contained in:
Ryan
2024-11-20 17:40:23 +01:00
committed by GitHub
parent 5a185c9575
commit 844d48050c
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/build-ubuntu.yml
+3 -1
View File
@@ -22,7 +22,7 @@ env:
IMAGE_LABEL_REPO: ${{ github.repository }} IMAGE_LABEL_REPO: ${{ github.repository }}
SLUG: ${{ github.repository_owner }}/ubuntu SLUG: ${{ github.repository_owner }}/ubuntu
DISTRO: ubuntu DISTRO: ubuntu
NODE: '16 18' NODE: '16 18 20'
BUILD_REF: ${{ github.sha }} BUILD_REF: ${{ github.sha }}
SKIP_TEST: false SKIP_TEST: false
PUSH_GHCR: ${{ github.repository == (github.event.pull_request.head.repo.full_name || github.repository) && '1' || '' }} PUSH_GHCR: ${{ github.repository == (github.event.pull_request.head.repo.full_name || github.repository) && '1' || '' }}
@@ -48,6 +48,7 @@ jobs:
PLATFORMS: PLATFORMS:
- linux/amd64,linux/arm64,linux/arm/v7 - linux/amd64,linux/arm64,linux/arm/v7
TAG: TAG:
- 24.04
- 22.04 - 22.04
- 20.04 - 20.04
steps: steps:
@@ -235,6 +236,7 @@ jobs:
max-parallel: 8 max-parallel: 8
matrix: matrix:
TAG: TAG:
- 24.04
- 22.04 - 22.04
- 20.04 - 20.04
TYPE: TYPE:
linux/ubuntu/scripts/runner.sh
+19 -8
View File
@@ -3,28 +3,38 @@
set -Eeuxo pipefail set -Eeuxo pipefail
. /etc/os-release
printf "\n\t🐋 Creating runner users 🐋\t\n" printf "\n\t🐋 Creating runner users 🐋\t\n"
# Default admin user/group
RUNNERADMIN="${RUNNER}admin"
groupadd -g 1001 "${RUNNER}" groupadd -g 1001 "${RUNNER}"
groupadd -g 1000 "${RUNNER}admin" groupadd -g 1000 "${RUNNERADMIN}" || RUNNERADMIN="$(id -gn 1000)" # 24.04 has default user 'ubuntu' with id=1000
useradd -u 1001 -g "${RUNNER}" -G sudo -m -s /bin/bash "${RUNNER}" useradd -u 1001 -g "${RUNNER}" -G sudo -m -s /bin/bash "${RUNNER}"
useradd -u 1000 -g "${RUNNER}admin" -G sudo -m -s /bin/bash "${RUNNER}admin" useradd -u 1000 -g "${RUNNERADMIN}" -G sudo -m -s /bin/bash "${RUNNERADMIN}" || true
usermod -aG docker "runner"
usermod -aG docker "runneradmin" usermod -aG docker "${RUNNER}"
usermod -aG docker "${RUNNERADMIN}"
{ {
echo "${RUNNER} ALL=(ALL) NOPASSWD: ALL" echo "${RUNNER} ALL=(ALL) NOPASSWD: ALL"
echo "${RUNNER}admin ALL=(ALL) NOPASSWD: ALL" echo "${RUNNERADMIN} ALL=(ALL) NOPASSWD: ALL"
} | tee -a /etc/sudoers } | tee -a /etc/sudoers
printf "\n\t🐋 Runner user 🐋\t\n" printf "\n\t🐋 Runner user 🐋\t\n"
su - "${RUNNER}" -c id su - "${RUNNER}" -c id
printf "\n\t🐋 Runner admin 🐋\t\n" printf "\n\t🐋 Runner admin 🐋\t\n"
su - "${RUNNER}admin" -c id su - "${RUNNERADMIN}" -c id
printf "\n\t🐋 Created non-root user 🐋\t\n" printf "\n\t🐋 Created non-root user 🐋\t\n"
grep "${RUNNER}" /etc/passwd grep "${RUNNER}" /etc/passwd
printf "\n\t🐋 Created non-root admin 🐋\t\n" printf "\n\t🐋 Created non-root admin 🐋\t\n"
grep "${RUNNER}admin" /etc/passwd grep "${RUNNERADMIN}" /etc/passwd
sed -i /etc/environment -e "s/USER=root/USER=${RUNNER}/g" sed -i /etc/environment -e "s/USER=root/USER=${RUNNER}/g"
@@ -33,6 +43,7 @@ mkdir -p "/home/${RUNNER}/work/_temp"
chown -R "${RUNNER}":"${RUNNER}" "/home/${RUNNER}/work" chown -R "${RUNNER}":"${RUNNER}" "/home/${RUNNER}/work"
mkdir -m 0700 -p "/home/${RUNNER}/.ssh" mkdir -m 0700 -p "/home/${RUNNER}/.ssh"
{ {
ssh-keyscan -t rsa github.com ssh-keyscan -t rsa github.com
ssh-keyscan -t rsa ssh.dev.azure.com ssh-keyscan -t rsa ssh.dev.azure.com
@@ -45,6 +56,6 @@ chown -R "${RUNNER}":"${RUNNER}" "/home/${RUNNER}/.ssh"
# Word is of the form "A"B"C" (B indicated). Did you mean "ABC" or "A\"B\"C"?shellcheck(SC2140) # Word is of the form "A"B"C" (B indicated). Did you mean "ABC" or "A\"B\"C"?shellcheck(SC2140)
# shellcheck disable=SC2140 # shellcheck disable=SC2140
chown -R "${RUNNER}":"${RUNNER}admin" "$AGENT_TOOLSDIRECTORY" chown -R "${RUNNER}":"${RUNNERADMIN}" "$AGENT_TOOLSDIRECTORY"
printf "\n\t🐋 Finished building 🐋\t\n" printf "\n\t🐋 Finished building 🐋\t\n"