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

Merge branch 'bugfix/1-typos' into 'main'

Browse Source 
bugfix: Correct some typos

See merge request qontainers/pipglr!37
This commit is contained in:
Chris Evich
2024-04-01 20:16:39 +00:00
parent 2161f09276 6a0ff34c9c
commit 94e1055c5e
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Containerfile
View File

@@ -24,7 +24,7 @@ ADD /home/ /home/
# an incompatible change be introduced. # an incompatible change be introduced.
ARG RUNNER_VERSION=latest ARG RUNNER_VERSION=latest
# Permit building containers for alternate architectures. At the time # Permit building containers for alternate architectures. At the time
# of this commit, only 'arm64' is available. # of this commit, only 'arm64' is available.
ARG TARGETARCH=amd64 ARG TARGETARCH=amd64
@@ -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"
# ==========================

21
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.
# #
@@ -29,11 +28,11 @@ done
# Make image smaller by not installing docs. # Make image smaller by not installing docs.
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
# DNF itself or a dependence may need upgrading, take care of it first. # DNF itself or a dependence may need upgrading, take care of it first.
$DNF upgrade $DNF upgrade
@@ -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
@@ -89,7 +88,7 @@ chmod 770 /home/runner
# read or write any files owned by these users (and/or hijack nested container processes). # read or write any files owned by these users (and/or hijack nested container processes).
# N/B: The range-end (999+64536) ensures a total of 65535 IDs are available for nested-containers. # N/B: The range-end (999+64536) ensures a total of 65535 IDs are available for nested-containers.
# This requires the host provide a sufficiently large range, i.e. `pipglr:<start>:65539` # This requires the host provide a sufficiently large range, i.e. `pipglr:<start>:65539`
echo -e "podman:1:999\npodman:1002:64536" | tee /etc/subuid > /etc/subgid echo -e "podman:1:999\npodman:1002:64536" | tee /etc/subuid >/etc/subgid
# Host volume mount necessary for nested-podman to use overlayfs2 for container & volume storage. # Host volume mount necessary for nested-podman to use overlayfs2 for container & volume storage.
mkdir -p /home/podman/.local/share/containers mkdir -p /home/podman/.local/share/containers
# Nested-container's local container-cache volume mount, recommended by gitlab-runner docs. # Nested-container's local container-cache volume mount, recommended by gitlab-runner docs.
@@ -103,8 +102,8 @@ touch /var/lib/systemd/linger/podman
# Setup 'podman' socket and a container-storage pruning service for 'podman' user. # Setup 'podman' socket and a container-storage pruning service for 'podman' user.
mkdir -p /home/podman/.config/systemd/user/{sockets.target.wants,default.target.wants} mkdir -p /home/podman/.config/systemd/user/{sockets.target.wants,default.target.wants}
cd /home/podman/.config/systemd/user/ cd /home/podman/.config/systemd/user/
ln -s $PWD/podman.socket ./sockets.target.wants/ # Added from Containerfile ln -s $PWD/podman.socket ./sockets.target.wants/ # Added from Containerfile
ln -s $PWD/prune.timer ./default.target.wants/ # also from Containerfile ln -s $PWD/prune.timer ./default.target.wants/ # also from Containerfile
# Substitute value from --build-arg if specified, otherwise use default from Containerfile. # Substitute value from --build-arg if specified, otherwise use default from Containerfile.
sed -i -e "s/@@@PRUNE_INTERVAL@@@/$PRUNE_INTERVAL/" ./prune.timer sed -i -e "s/@@@PRUNE_INTERVAL@@@/$PRUNE_INTERVAL/" ./prune.timer
# Containerfile ADD instruction does not properly set ownership/permissions. # Containerfile ADD instruction does not properly set ownership/permissions.