diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-01 17:53:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-02-01 22:20:29 (GMT) |
| commit | 1729e1292dca7f2a854f90c2d97e37bad120a884 (patch) | |
| tree | 22579479b74d758d898ba7383fbbe17c4a046fd4 /.gitlab | |
| parent | 89700cba9a762548f11918fa711f7de45d70a575 (diff) | |
| download | CMake-1729e1292dca7f2a854f90c2d97e37bad120a884.zip CMake-1729e1292dca7f2a854f90c2d97e37bad120a884.tar.gz CMake-1729e1292dca7f2a854f90c2d97e37bad120a884.tar.bz2 | |
ci: update to Fedora 35 for Linux base images
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/docker/fedora35/Dockerfile (renamed from .gitlab/ci/docker/fedora34/Dockerfile) | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora35/install_deps.sh (renamed from .gitlab/ci/docker/fedora34/install_deps.sh) | 2 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora35/install_ispc.sh (renamed from .gitlab/ci/docker/fedora34/install_ispc.sh) | 0 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora35/install_rvm.sh (renamed from .gitlab/ci/docker/fedora34/install_rvm.sh) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/fedora34/Dockerfile b/.gitlab/ci/docker/fedora35/Dockerfile index af2322d..d1614b4 100644 --- a/.gitlab/ci/docker/fedora34/Dockerfile +++ b/.gitlab/ci/docker/fedora35/Dockerfile @@ -1,10 +1,10 @@ -FROM fedora:34 as rvm-build +FROM fedora:35 as rvm-build MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_rvm.sh /root/install_rvm.sh RUN sh /root/install_rvm.sh -FROM fedora:34 +FROM fedora:35 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora35/install_deps.sh index bef3a97..30214af 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.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 \ diff --git a/.gitlab/ci/docker/fedora34/install_ispc.sh b/.gitlab/ci/docker/fedora35/install_ispc.sh index fdc14b5..fdc14b5 100755 --- a/.gitlab/ci/docker/fedora34/install_ispc.sh +++ b/.gitlab/ci/docker/fedora35/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora34/install_rvm.sh b/.gitlab/ci/docker/fedora35/install_rvm.sh index fca5104..fca5104 100755 --- a/.gitlab/ci/docker/fedora34/install_rvm.sh +++ b/.gitlab/ci/docker/fedora35/install_rvm.sh |