summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2018-04-17 16:34:13 +0200
committerChristoph Reiter <reiter.christoph@gmail.com>2018-04-17 16:34:13 +0200
commit30fbfdcfcdba37d421970d6a730f3e816b95f235 (patch)
treeeff71138b821bb4ffdc9fa4aa8a5f579cc210a75
parentc48f60a5d9576736d86d1ef381c3e18ce7bab9ea (diff)
downloadpygobject-30fbfdcfcdba37d421970d6a730f3e816b95f235.tar.gz
gitlab-ci: move docker images to gitlab.gnome.org
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--.gitlab-ci/README.rst3
-rwxr-xr-x.gitlab-ci/run-docker-old.sh2
-rwxr-xr-x.gitlab-ci/run-docker.sh2
4 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 584d3082..d4bfed07 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ cache:
.defaults: &defaults
stage: build_and_test
- image: lazka/pygobject:v3
+ image: registry.gitlab.gnome.org/gnome/pygobject/main:v4
artifacts:
paths:
- coverage/
@@ -29,7 +29,7 @@ cache:
coverage:
stage: coverage
- image: lazka/pygobject:v3
+ image: registry.gitlab.gnome.org/gnome/pygobject/main:v4
artifacts:
paths:
- coverage/
@@ -40,7 +40,7 @@ coverage:
pages:
stage: deploy
- image: lazka/pygobject:v3
+ image: registry.gitlab.gnome.org/gnome/pygobject/main:v4
dependencies:
- coverage
script:
@@ -117,6 +117,6 @@ pypy3:
xenial-i386-py2:
stage: build_and_test
- image: lazka/pygobject:pyenv-old
+ image: registry.gitlab.gnome.org/gnome/pygobject/old:v2
script:
- bash -x ./.gitlab-ci/test-docker-old.sh
diff --git a/.gitlab-ci/README.rst b/.gitlab-ci/README.rst
index 107abf0e..3ebab30d 100644
--- a/.gitlab-ci/README.rst
+++ b/.gitlab-ci/README.rst
@@ -1 +1,2 @@
-The Dockerfile is available at https://hub.docker.com/r/lazka/pygobject/
+The images are available at
+https://gitlab.gnome.org/GNOME/pygobject/container_registry
diff --git a/.gitlab-ci/run-docker-old.sh b/.gitlab-ci/run-docker-old.sh
index bdd6e54d..7b916958 100755
--- a/.gitlab-ci/run-docker-old.sh
+++ b/.gitlab-ci/run-docker-old.sh
@@ -2,7 +2,7 @@
set -e
-TAG="lazka/pygobject:pyenv-old"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/old:v2"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile.old" .
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 5f8b7ea7..23f9fee3 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,7 +2,7 @@
set -e
-TAG="lazka/pygobject:v3"
+TAG="registry.gitlab.gnome.org/gnome/pygobject/main:v4"
sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .