[glib-networking/mcatanzaro/ci-test] test new CI image
- From: Michael Catanzaro <mcatanzaro src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib-networking/mcatanzaro/ci-test] test new CI image
- Date: Wed, 20 Nov 2019 22:46:02 +0000 (UTC)
commit 1d656b79d53d76274ca832a27d66c15df19f9cc1
Author: Michael Catanzaro <mcatanzaro gnome org>
Date: Wed Nov 20 16:45:53 2019 -0600
test new CI image
.gitlab-ci.yml | 2 +-
.gitlab-ci/Dockerfile | 2 +-
.gitlab-ci/run-docker.sh | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5075bd..87428fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v6
+image: registry.gitlab.gnome.org/gnome/glib-networking/master:v7
fedora-x86_64:
script:
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 895c710..a315e2b 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:30
+FROM fedora:32
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 e6d80ce..658bd75 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,17 +2,17 @@
set -e
-TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v6"
+TAG="registry.gitlab.gnome.org/gnome/glib-networking/master:v7"
cd "$(dirname "$0")"
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
+docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
if [ "$1" = "--push" ]; then
- sudo docker login registry.gitlab.gnome.org
- sudo docker push $TAG
+ docker login registry.gitlab.gnome.org
+ docker push $TAG
else
- sudo docker run --rm \
+ docker run --rm \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
--tty --interactive "${TAG}" bash
fi
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]