[gegl] ci: further arch linux glibc workaround



commit dc8c551421c6ad487e6bcbb76d290042b35585d3
Author: Øyvind Kolås <pippin gimp org>
Date:   Thu Feb 25 21:41:10 2021 +0100

    ci: further arch linux glibc workaround
    
    Lock the base arch image installed to 20210214.0.15477 and ignore glibc
    upgrades.

 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a08543a3..c4cfc0ef9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,8 +26,8 @@ build-image:
   script:
     - mkdir -p /kaniko/.docker
     - echo 
"{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" 
/kaniko/.docker/config.json
-    - echo "FROM archlinux/base:latest" > Dockerfile
-    - echo "RUN pacman -U --noconfirm 
https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst && pacman -Syu --noconfirm 
--ignore glibc --needed git base-devel ccache meson lcms2 gobject-introspection vala pacman-contrib && pacman 
-Scc " >> Dockerfile
+    - echo "FROM archlinux:base-20210214.0.15477" > Dockerfile
+    - echo "RUN pacman -Syu --noconfirm --ignore glibc --needed git base-devel ccache meson lcms2 
gobject-introspection vala pacman-contrib && pacman -Scc " >> Dockerfile
 
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination 
$CI_REGISTRY_IMAGE:ci-latest --cache=true --cache-ttl=120h
 
@@ -40,7 +40,6 @@ build-image:
     GIT_DEPTH: "5"
     CCACHE_MAXSIZE: "32Mi"
   before_script:
-    - pacman -U --noconfirm https://archive.archlinux.org/packages/g/glibc/glibc-2.33-3-x86_64.pkg.tar.zst
     - pacman -Syu --ignore glibc --noconfirm --needed git base-devel ccache meson lcms2 
gobject-introspection vala
     - git clone --depth=$GIT_DEPTH https://gitlab.gnome.org/GNOME/babl.git _babl
     - cd _babl


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]