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

Merge branch 'ci-docker-fun-times' into 'master'

Browse Source 
ci: Build Docker images rather than OCI images if using podman

See merge request GNOME/glib!1255
This commit is contained in:
Emmanuele Bassi 2019-12-16 12:44:16 +00:00
commit 988dd6adf8
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,8 +88,18 @@ fi
TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}" TAG="registry.gitlab.gnome.org/gnome/glib/${base}:${base_version}"
if [ $build == 1 ]; then if [ $build == 1 ]; then
if docker --help |& grep -q podman; then
# Docker is actually implemented by podman, and its OCI output
# is incompatible with some of the dockerd instances on GitLab
# CI runners.
format="--format docker"
else
format=""
fi
echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}" echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
sudo docker build \ sudo docker build \
${format} \
--build-arg HOST_USER_ID="$UID" \ --build-arg HOST_USER_ID="$UID" \
--tag "${TAG}" \ --tag "${TAG}" \
--file "${base}.Dockerfile" . --file "${base}.Dockerfile" .