[glib-networking/mcatanzaro/f30-ci] Upgrade CI to Fedora 30



commit 1bdbd180655b5bbc0e0707fb415ba1b5b932c383
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Wed May 8 17:25:18 2019 -0500

    Upgrade CI to Fedora 30
    
    We need access to glib 2.60

 .gitlab-ci/Dockerfile    |  2 +-
 .gitlab-ci/run-docker.sh | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 01ddead..895c710 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:29
+FROM fedora:30
 
 RUN dnf update -y \
     && dnf install -y 'dnf-command(builddep)' \
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index f0c1df3..4664edc 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,11 +2,17 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v2"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v3"
 
 cd "$(dirname "$0")"
-docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
-    --file "Dockerfile" .
+
+# Workaround for error when running with sudo:
+#
+#Step 5/8 : RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+# ---> Running in 2ac7b00c2788
+#useradd: UID 0 is not unique
+docker build --build-arg HOST_USER_ID=1000 --tag "${TAG}" --file "Dockerfile" .
+#docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
 
 if [ "$1" = "--push" ]; then
   docker login registry.gitlab.gnome.org


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]