luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-11 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

ci: Fix podman support in run-docker.sh

Browse Source 
In newer Fedora versions, `docker` doesn't exist. You have to use
`podman`.
This commit is contained in:
Nirbheek Chauhan 2022-12-31 01:50:29 +05:30
parent a587212080
commit fc6843bec8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.gitlab-ci/run-docker.sh
View File

@ -15,16 +15,17 @@ read_arg() {
fi fi
} }
SUDO_CMD="sudo" if type -p podman; then
if docker -v |& grep -q podman; then
# Using podman # Using podman
SUDO_CMD="" DOCKER_CMD="podman"
# Docker is actually implemented by podman, and its OCI output # Docker is actually implemented by podman, and its OCI output
# is incompatible with some of the dockerd instances on GitLab # is incompatible with some of the dockerd instances on GitLab
# CI runners. # CI runners.
export BUILDAH_FORMAT=docker export BUILDAH_FORMAT=docker
elif getent group docker | grep -q "\b${USER}\b"; then elif getent group docker | grep -q "\b${USER}\b"; then
SUDO_CMD="" DOCKER_CMD="docker"
else
DOCKER_CMD="sudo docker"
fi fi
set -e set -e
@ -103,7 +104,7 @@ TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}"
if [ $build == 1 ]; then if [ $build == 1 ]; then
echo -e "\\e[1;32mBUILDING\\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mBUILDING\\e[0m: ${base} as ${TAG}"
$SUDO_CMD docker build \ $DOCKER_CMD build \
--build-arg HOST_USER_ID="$UID" \ --build-arg HOST_USER_ID="$UID" \
--build-arg COVERITY_SCAN_PROJECT_NAME="${COVERITY_SCAN_PROJECT_NAME}" \ --build-arg COVERITY_SCAN_PROJECT_NAME="${COVERITY_SCAN_PROJECT_NAME}" \
--build-arg COVERITY_SCAN_TOKEN="${COVERITY_SCAN_TOKEN}" \ --build-arg COVERITY_SCAN_TOKEN="${COVERITY_SCAN_TOKEN}" \
@ -116,16 +117,16 @@ if [ $push == 1 ]; then
echo -e "\\e[1;32mPUSHING\\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mPUSHING\\e[0m: ${base} as ${TAG}"
if [ $no_login == 0 ]; then if [ $no_login == 0 ]; then
$SUDO_CMD docker login registry.gitlab.gnome.org $DOCKER_CMD login registry.gitlab.gnome.org
fi fi
$SUDO_CMD docker push $TAG $DOCKER_CMD push $TAG
exit $? exit $?
fi fi
if [ $run == 1 ]; then if [ $run == 1 ]; then
echo -e "\\e[1;32mRUNNING\\e[0m: ${base} as ${TAG}" echo -e "\\e[1;32mRUNNING\\e[0m: ${base} as ${TAG}"
$SUDO_CMD docker run \ $DOCKER_CMD run \
--rm \ --rm \
--volume "$(pwd)/..:/home/user/app" \ --volume "$(pwd)/..:/home/user/app" \
--workdir "/home/user/app" \ --workdir "/home/user/app" \