summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/Dockerfile2
-rwxr-xr-x.gitlab-ci/run-docker.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile
index 5a7a9815..876ec3d1 100644
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -41,7 +41,7 @@ RUN dnf -y install \
zlib-devel \
&& dnf clean all
-RUN pip3 install meson
+RUN pip3 install meson==0.46.1
ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID}
diff --git a/.gitlab-ci/run-docker.sh b/.gitlab-ci/run-docker.sh
index 91694fb3..77eff633 100755
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -2,8 +2,10 @@
set -e
-sudo docker build --build-arg HOST_USER_ID="$UID" --tag "gitlab-gi" \
+TAG="registry.gitlab.gnome.org/gnome/gobject-introspection:v1"
+
+sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
--file "Dockerfile" .
sudo docker run --rm \
--volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
- --tty --interactive "gitlab-gi" bash
+ --tty --interactive "${TAG}" bash