[libsoup/wip/update-ci: 3/3] ci: Update image version




commit 223a22d4e2a6e90d5a5f01382d4828e5efbad958
Author: Patrick Griffis <pgriffis igalia com>
Date:   Fri Jan 22 13:26:45 2021 -0600

    ci: Update image version

 .gitlab-ci.yml           | 2 +-
 .gitlab-ci/Dockerfile    | 8 +++-----
 .gitlab-ci/run-docker.sh | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 839cb880..5c95614c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/libsoup/master:v8
+image: registry.gitlab.gnome.org/gnome/libsoup/master:v9
 
 stages:
   - build
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 8fb708e3..c6b0fd04 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -38,16 +38,14 @@ RUN dnf update -y \
     && ./autogen.sh --prefix=/usr \
     && make install \
     && popd \
-    && rm -rf glib gobject-introspection vala
+    && rm -rf glib gobject-introspection vala \
+    && python2.7 -m ensurepip \
+    && pip2.7 install virtualenv autobahntestsuite
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
 RUN useradd -u $HOST_USER_ID -ms /bin/bash user
 
-RUN python2.7 -m ensurepip
-RUN pip2.7 install virtualenv
-RUN pip2.7 install autobahntestsuite
-
 USER user
 WORKDIR /home/user
 
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index a917a940..6bb7df13 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v8"
+TAG="registry.gitlab.gnome.org/gnome/libsoup/master:v9"
 
 cd "$(dirname "$0")"
 podman build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" --format=docker .


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