From e07294e5697af7c2b8c5b9db6b696896533e7b78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Fri, 8 Dec 2023 17:27:06 +0100 Subject: [PATCH] ci: update alpine CI container to 3.19 And be more specific with version just in case. --- .gitlab-ci.yml | 2 +- .gitlab-ci/alpine.Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc2932902..49ea6e373 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,7 +14,7 @@ variables: FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/glib/fedora:v24" COVERITY_IMAGE: "registry.gitlab.gnome.org/gnome/glib/coverity:v7" DEBIAN_IMAGE: "registry.gitlab.gnome.org/gnome/glib/debian-stable:v18" - ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v1" + ALPINE_IMAGE: "registry.gitlab.gnome.org/gnome/glib/alpine:v2" MINGW_IMAGE: "registry.gitlab.gnome.org/gnome/glib/mingw:v14" MESON_TEST_TIMEOUT_MULTIPLIER: 4 G_MESSAGES_DEBUG: all diff --git a/.gitlab-ci/alpine.Dockerfile b/.gitlab-ci/alpine.Dockerfile index 145e3194c..352c2c6f9 100644 --- a/.gitlab-ci/alpine.Dockerfile +++ b/.gitlab-ci/alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:latest +FROM alpine:3.19 RUN apk add --no-cache \ bash \ @@ -25,8 +25,6 @@ RUN apk add --no-cache \ ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 MUSL_LOCPATH=/usr/share/i18n/locales/musl -RUN pip3 install --break-system-packages meson==1.2.3 - ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} RUN adduser -D -u $HOST_USER_ID -s /bin/bash user