clang-format: rework "nm-code-format-container.sh" script

Instead of doing the broken `podman run` and `podman start` approach,
build an image ("nm-code-format:f38"), cache it, and use it to run
"nm-code-format.sh" via `podman run`. We should build and keep a
container image, not a container.

The benefit is that this allows to hand over the command line arguments
to "nm-code-format.sh". In particular the "-u" and "-F" options, which
are life savers.

This means,

  $ contrib/scripts/nm-code-format-container.sh -u

works.

Try also

  $ contrib/scripts/nm-code-format-container.sh -h

which tells you that you are running inside the container, and how to
delete/renew the container image.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1798
This commit is contained in:
Thomas Haller
2023-11-17 20:22:53 +01:00
parent 21a6d7a0b6
commit a6e085b3e8
3 changed files with 30 additions and 29 deletions

View File

@@ -16,36 +16,31 @@ FEDORA_VERSION="$(sed '/^ tier: 1/,/^ - name/!d' .gitlab-ci/config.yml | sed
test -n "$FEDORA_VERSION" || die "Could not detect the Fedora version in .gitlab-ci/config.yml"
PODNAME="nm-code-format-f$FEDORA_VERSION"
IMAGENAME="nm-code-format:f$FEDORA_VERSION"
RENEW=0
for a; do
case "$a" in
-f)
RENEW=1
;;
*)
die "invalid argument \"$a\""
;;
esac
done
ARGS=( "$@" )
set -x
if [ "$RENEW" == 1 ]; then
if podman container exists "$PODNAME" ; then
podman rm "$PODNAME"
fi
if ! podman image exists "$IMAGENAME" ; then
echo "Building image \"$IMAGENAME\"..."
podman build \
--squash-all \
--tag "$IMAGENAME" \
-f <(cat <<EOF
FROM fedora:$FEDORA_VERSION
RUN dnf upgrade -y
RUN dnf install -y git /usr/bin/clang-format
EOF
)
fi
if ! podman container exists "$PODNAME" ; then
podman run \
--name="$PODNAME" \
-v "$DIR:/tmp/NetworkManager:Z" \
-w /tmp/NetworkManager \
"fedora:$FEDORA_VERSION" \
/bin/bash -c 'dnf upgrade -y && dnf install -y git /usr/bin/clang-format && ./contrib/scripts/nm-code-format.sh -i'
exit 0
fi
CMD=( ./contrib/scripts/nm-code-format.sh "${ARGS[@]}" )
podman start -a "$PODNAME"
podman run \
--rm \
--name "nm-code-format-f$FEDORA_VERSION" \
-v "$DIR:/tmp/NetworkManager:Z" \
-w /tmp/NetworkManager \
-e "_NM_CODE_FORMAT_CONTAINER=$IMAGENAME" \
-ti \
"$IMAGENAME" \
"${CMD[@]}"