diff options
| -rw-r--r-- | .gitlab/ci/docker/fedora33/Dockerfile (renamed from .gitlab/ci/docker/fedora31/Dockerfile) | 4 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora33/install_deps.sh (renamed from .gitlab/ci/docker/fedora31/install_deps.sh) | 0 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora33/install_ispc.sh (renamed from .gitlab/ci/docker/fedora31/install_ispc.sh) | 0 | ||||
| -rwxr-xr-x | .gitlab/ci/docker/fedora33/install_rvm.sh (renamed from .gitlab/ci/docker/fedora31/install_rvm.sh) | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/.gitlab/ci/docker/fedora31/Dockerfile b/.gitlab/ci/docker/fedora33/Dockerfile index 80ab379..8ebcb9e 100644 --- a/.gitlab/ci/docker/fedora31/Dockerfile +++ b/.gitlab/ci/docker/fedora33/Dockerfile @@ -1,10 +1,10 @@ -FROM fedora:31 as rvm-build +FROM fedora:33 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:31 +FROM fedora:33 MAINTAINER Ben Boeckel <ben.boeckel@kitware.com> COPY install_deps.sh /root/install_deps.sh diff --git a/.gitlab/ci/docker/fedora31/install_deps.sh b/.gitlab/ci/docker/fedora33/install_deps.sh index c1391e3..c1391e3 100755 --- a/.gitlab/ci/docker/fedora31/install_deps.sh +++ b/.gitlab/ci/docker/fedora33/install_deps.sh diff --git a/.gitlab/ci/docker/fedora31/install_ispc.sh b/.gitlab/ci/docker/fedora33/install_ispc.sh index fdc14b5..fdc14b5 100755 --- a/.gitlab/ci/docker/fedora31/install_ispc.sh +++ b/.gitlab/ci/docker/fedora33/install_ispc.sh diff --git a/.gitlab/ci/docker/fedora31/install_rvm.sh b/.gitlab/ci/docker/fedora33/install_rvm.sh index 2332ab7..6d4fa97 100755 --- a/.gitlab/ci/docker/fedora31/install_rvm.sh +++ b/.gitlab/ci/docker/fedora33/install_rvm.sh @@ -13,6 +13,9 @@ dnf install --setopt=install_weak_deps=False -y \ curl -sSL https://get.rvm.io | bash -s stable +# This is intentionally an older version. +# If updating, the associated `env_fedora*_makefiles.cmake` file needs updated +# as well. /usr/local/rvm/bin/rvm install ruby-2.7.0 tar -C /usr/local -cf /root/rvm.tar rvm |