mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 02:19:18 -05:00
ci: update to Fedora 34 for Linux base images
This commit is contained in:
@@ -1,10 +1,10 @@
|
|||||||
FROM fedora:33 as rvm-build
|
FROM fedora:34 as rvm-build
|
||||||
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
|
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
|
||||||
|
|
||||||
COPY install_rvm.sh /root/install_rvm.sh
|
COPY install_rvm.sh /root/install_rvm.sh
|
||||||
RUN sh /root/install_rvm.sh
|
RUN sh /root/install_rvm.sh
|
||||||
|
|
||||||
FROM fedora:33
|
FROM fedora:34
|
||||||
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
|
MAINTAINER Ben Boeckel <ben.boeckel@kitware.com>
|
||||||
|
|
||||||
COPY install_deps.sh /root/install_deps.sh
|
COPY install_deps.sh /root/install_deps.sh
|
||||||
+7
-1
@@ -67,7 +67,7 @@ dnf install --setopt=install_weak_deps=False -y \
|
|||||||
protobuf-devel protobuf-c-devel protobuf-lite-devel \
|
protobuf-devel protobuf-c-devel protobuf-lite-devel \
|
||||||
pypy2 pypy2-devel \
|
pypy2 pypy2-devel \
|
||||||
pypy3 pypy3-devel \
|
pypy3 pypy3-devel \
|
||||||
python2 python2-devel python2-numpy \
|
python2 python2-devel \
|
||||||
python3 python3-devel python3-numpy \
|
python3 python3-devel python3-numpy \
|
||||||
python3-jsmin python3-jsonschema \
|
python3-jsmin python3-jsonschema \
|
||||||
ruby rubygems ruby-devel \
|
ruby rubygems ruby-devel \
|
||||||
@@ -80,3 +80,9 @@ dnf install --setopt=install_weak_deps=False -y \
|
|||||||
xz-devel
|
xz-devel
|
||||||
|
|
||||||
dnf clean all
|
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
|
||||||
Reference in New Issue
Block a user