public/pipglr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix: Correct some typos

Browse Source
This commit is contained in:
Gabriel Nützi
2024-04-01 20:16:38 +00:00
committed by Chris Evich
parent 2161f09276
commit 6a0ff34c9c
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Containerfile
View File

@@ -45,8 +45,10 @@ ENTRYPOINT /lib/systemd/systemd
# Gitlab-runner configuration options, may be freely overridden at # Gitlab-runner configuration options, may be freely overridden at
# container image build time. # container image build time.
ARG DEFAULT_JOB_IMAGE=registry.fedoraproject.org/fedora-minimal:latest ARG DEFAULT_JOB_IMAGE=registry.fedoraproject.org/fedora-minimal:latest
# Allow image-builders to override the Gitlab URL # Allow image-builders to override the Gitlab URL
ARG GITLAB_URL=https://gitlab.com/ ARG GITLAB_URL=https://gitlab.com/
# Run nested containers in --privileged mode - required to allow building # Run nested containers in --privileged mode - required to allow building
# container images using podman or buildah. Otherwise may be set 'false'. # container images using podman or buildah. Otherwise may be set 'false'.
ARG NESTED_PRIVILEGED=true ARG NESTED_PRIVILEGED=true
@@ -72,17 +74,21 @@ LABEL register="podman run -it --rm \
-e DOCKER_NETWORK_MODE=host \ -e DOCKER_NETWORK_MODE=host \
-e DOCKER_PRIVILEGED=${NESTED_PRIVILEGED} \ -e DOCKER_PRIVILEGED=${NESTED_PRIVILEGED} \
--entrypoint=/usr/bin/gitlab-runner \$IMAGE register" --entrypoint=/usr/bin/gitlab-runner \$IMAGE register"
# Additionally, the nested-podman storage volumes must be pre-created with # Additionally, the nested-podman storage volumes must be pre-created with
# 'podman' UID/GID values to allow nested containers access. # 'podman' UID/GID values to allow nested containers access.
LABEL setupstorage="podman volume create --opt o=uid=1000,gid=1000 pipglr-storage" LABEL setupstorage="podman volume create --opt o=uid=1000,gid=1000 pipglr-storage"
# Lastly, the gitlab-runner will manage container-cache in this directory, # Lastly, the gitlab-runner will manage container-cache in this directory,
# which will also be bind-mounted into every container. So it must be # which will also be bind-mounted into every container. So it must be
# writable by both 'podman' user and 'runner' group. # writable by both 'podman' user and 'runner' group.
LABEL setupcache="podman volume create --opt o=uid=1000,gid=1001 pipglr-cache" LABEL setupcache="podman volume create --opt o=uid=1000,gid=1001 pipglr-cache"
# Helper to extract the current configuration secret to allow editing. # Helper to extract the current configuration secret to allow editing.
LABEL dumpconfig="podman run -it --rm \ LABEL dumpconfig="podman run -it --rm \
--secret config.toml --entrypoint=/bin/cat \ --secret config.toml --entrypoint=/bin/cat \
\$IMAGE /var/run/secrets/config.toml" \$IMAGE /var/run/secrets/config.toml"
# Executing the runner container depends on the config.toml secret being # Executing the runner container depends on the config.toml secret being
# set (see above) and two volumes existing with correct permissions set. # set (see above) and two volumes existing with correct permissions set.
# Note: The contents of the volumes are not critical, they may be removed # Note: The contents of the volumes are not critical, they may be removed
@@ -93,3 +99,4 @@ LABEL run="podman run -dt --name pipglr \
-v pipglr-cache:/cache \ -v pipglr-cache:/cache \
--systemd true --privileged \ --systemd true --privileged \
--device /dev/fuse \$IMAGE" --device /dev/fuse \$IMAGE"
# ==========================

11
root/setup.sh
View File

@@ -1,4 +1,3 @@
# This script is intended to be run during container-image build. Any # This script is intended to be run during container-image build. Any
# other usage outside this context is likely to cause harm. # other usage outside this context is likely to cause harm.
# #
@@ -30,7 +29,7 @@ done
DNF="dnf --setopt=tsflags=nodocs -y" DNF="dnf --setopt=tsflags=nodocs -y"
for rpm in $(egrep -v '^(# )+' </root/xpackages.txt); do for rpm in $(egrep -v '^(# )+' </root/xpackages.txt); do
x+="--exclude=$rpm "; x+="--exclude=$rpm "
done done
set -x # show what's happening to make debugging easier set -x # show what's happening to make debugging easier
@@ -51,10 +50,10 @@ $DNF $x --setopt=tsflags=noscripts install \
# systemd services, like anything kernel related or login gettys. # systemd services, like anything kernel related or login gettys.
rm -rf \ rm -rf \
/etc/dnf/protected.d/* \ /etc/dnf/protected.d/* \
/etc/sytemd/system/getty.target.wants/* \ /etc/systemd/system/getty.target.wants/* \
/etc/sytemd/system/multi-user.target.wants/* \ /etc/systemd/system/multi-user.target.wants/* \
/etc/sytemd/system/sysinit.target.wants/* \ /etc/systemd/system/sysinit.target.wants/* \
/etc/sytemd/system/timers.target.wants/* \ /etc/systemd/system/timers.target.wants/* \
/lib/systemd/system/graphical.target.wants/* \ /lib/systemd/system/graphical.target.wants/* \
/lib/systemd/system/multi-user.target.wants/{getty.target,systemd-ask-password-wall.path} \ /lib/systemd/system/multi-user.target.wants/{getty.target,systemd-ask-password-wall.path} \
/lib/systemd/system/sys-kernel*.mount /lib/systemd/system/sys-kernel*.mount