diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-26 18:02:18 +0100 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-12-26 18:03:34 +0100 |
| commit | 66d895b6e26c2ea3925dc90cf981d4191f7723bd (patch) | |
| tree | fcfb468b0facd5b1a9a9975e91fd7fcbf7a04f52 | |
| parent | 0c9fec2c40db7a1a06c082f38f6151fa1151607c (diff) | |
| download | gobject-introspection-66d895b6e26c2ea3925dc90cf981d4191f7723bd.tar.gz | |
ci: update the docker image
So we get glib 2.58
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile | 4 | ||||
| -rwxr-xr-x | .gitlab-ci/run-docker.sh | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fff5f6eb..4d8c8936 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ stages: - build -image: registry.gitlab.gnome.org/gnome/gobject-introspection/3.30:v1 +image: registry.gitlab.gnome.org/gnome/gobject-introspection/3.30:v2 cache: paths: diff --git a/.gitlab-ci/Dockerfile b/.gitlab-ci/Dockerfile index bb770eac..1e4df21b 100644 --- a/.gitlab-ci/Dockerfile +++ b/.gitlab-ci/Dockerfile @@ -1,4 +1,4 @@ -FROM fedora:28 +FROM fedora:29 RUN dnf -y install \ autoconf \ @@ -51,7 +51,7 @@ RUN dnf -y install \ zlib-devel \ && dnf clean all -RUN pip3 install meson==0.48.0 +RUN pip3 install meson==0.48.2 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 54855d30..faa67f77 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/gobject-introspection/3.30:v1" +TAG="registry.gitlab.gnome.org/gnome/gobject-introspection/3.30:v2" sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \ --file "Dockerfile" . |