summaryrefslogtreecommitdiffstats
path: root/.gitlab/ci/docker
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/docker')
-rw-r--r--.gitlab/ci/docker/fedora34/Dockerfile (renamed from .gitlab/ci/docker/fedora33/Dockerfile)4
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_deps.sh (renamed from .gitlab/ci/docker/fedora33/install_deps.sh)8
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_ispc.sh (renamed from .gitlab/ci/docker/fedora33/install_ispc.sh)0
-rwxr-xr-x.gitlab/ci/docker/fedora34/install_rvm.sh (renamed from .gitlab/ci/docker/fedora33/install_rvm.sh)0
4 files changed, 9 insertions, 3 deletions
diff --git a/.gitlab/ci/docker/fedora33/Dockerfile b/.gitlab/ci/docker/fedora34/Dockerfile
index 8ebcb9e..af2322d 100644
--- a/.gitlab/ci/docker/fedora33/Dockerfile
+++ b/.gitlab/ci/docker/fedora34/Dockerfile
@@ -1,10 +1,10 @@
-FROM fedora:33 as rvm-build
+FROM fedora:34 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:33
+FROM fedora:34
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
COPY install_deps.sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/fedora33/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh
index cdfe35e..6edb2aa 100755
--- a/.gitlab/ci/docker/fedora33/install_deps.sh
+++ b/.gitlab/ci/docker/fedora34/install_deps.sh
@@ -67,7 +67,7 @@ dnf install --setopt=install_weak_deps=False -y \
protobuf-devel protobuf-c-devel protobuf-lite-devel \
pypy2 pypy2-devel \
pypy3 pypy3-devel \
- python2 python2-devel python2-numpy \
+ python2 python2-devel \
python3 python3-devel python3-numpy \
python3-jsmin python3-jsonschema \
ruby rubygems ruby-devel \
@@ -80,3 +80,9 @@ dnf install --setopt=install_weak_deps=False -y \
xz-devel
dnf clean all
+
+# Fedora no longer packages python2 numpy.
+curl https://bootstrap.pypa.io/pip/2.7/get-pip.py -o get-pip.py
+python2 get-pip.py
+rm get-pip.py
+pip2.7 install numpy
diff --git a/.gitlab/ci/docker/fedora33/install_ispc.sh b/.gitlab/ci/docker/fedora34/install_ispc.sh
index fdc14b5..fdc14b5 100755
--- a/.gitlab/ci/docker/fedora33/install_ispc.sh
+++ b/.gitlab/ci/docker/fedora34/install_ispc.sh
diff --git a/.gitlab/ci/docker/fedora33/install_rvm.sh b/.gitlab/ci/docker/fedora34/install_rvm.sh
index 6d4fa97..6d4fa97 100755
--- a/.gitlab/ci/docker/fedora33/install_rvm.sh
+++ b/.gitlab/ci/docker/fedora34/install_rvm.sh