Kaynağa Gözat

ci: update to Fedora 35 for Linux base images

Brad King 3 yıl önce
ebeveyn
işleme
1729e1292d

+ 2 - 2
.gitlab/ci/docker/fedora34/Dockerfile → .gitlab/ci/docker/fedora35/Dockerfile

@@ -1,10 +1,10 @@
-FROM fedora:34 as rvm-build
+FROM fedora:35 as rvm-build
 MAINTAINER Ben Boeckel <[email protected]>
 
 COPY install_rvm.sh /root/install_rvm.sh
 RUN sh /root/install_rvm.sh
 
-FROM fedora:34
+FROM fedora:35
 MAINTAINER Ben Boeckel <[email protected]>
 
 COPY install_deps.sh /root/install_deps.sh

+ 1 - 1
.gitlab/ci/docker/fedora34/install_deps.sh → .gitlab/ci/docker/fedora35/install_deps.sh

@@ -75,7 +75,7 @@ dnf install --setopt=install_weak_deps=False -y \
     libinput-devel systemd-devel \
     libjpeg-turbo-devel \
     libpng-devel \
-    libpq-devel postgresql-server-devel \
+    postgresql-server-devel \
     libtiff-devel \
     libuv-devel \
     libxml2-devel \

+ 0 - 0
.gitlab/ci/docker/fedora34/install_ispc.sh → .gitlab/ci/docker/fedora35/install_ispc.sh


+ 0 - 0
.gitlab/ci/docker/fedora34/install_rvm.sh → .gitlab/ci/docker/fedora35/install_rvm.sh