From cf9e3ace4b788f985922b1141457ed92e8947bab Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Mon, 8 Jun 2020 03:11:39 +0200 Subject: [PATCH] ci: update Dockerfile --- common/Dockerfile | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/common/Dockerfile b/common/Dockerfile index 6562253fe..2b3c97ab6 100644 --- a/common/Dockerfile +++ b/common/Dockerfile @@ -28,7 +28,7 @@ # along with this program. If not, see . ################################################################################### -FROM fedora:29 +FROM fedora:32 LABEL \ org.label-schema.schema-version="1.0" \ @@ -45,16 +45,8 @@ LABEL \ # Toolchain RUN dnf -y install \ gcc gcc-c++ \ - pkgconfig make cmake \ - autoconf automake autogen libtool \ - texinfo git curl tar - -# Several tools only needed for developement and testing -RUN dnf -y install \ - rpmdevtools rpm-build - -# Some of the dependencies are only available in our own repo -ADD https://packages.fein-aachen.org/fedora/fein.repo /etc/yum.repos.d/ + make cmake \ + git curl tar # Dependencies RUN dnf -y install \ @@ -68,10 +60,10 @@ RUN dnf -y install \ RUN cd /tmp && \ git clone --recursive https://github.com/Snaipe/Criterion && \ mkdir -p Criterion/build && cd Criterion/build && \ + git checkout v2.3.3 && \ cmake -DCMAKE_INSTALL_LIBDIR=/usr/local/lib64 .. && make install && \ rm -rf /tmp/* ENV LD_LIBRARY_PATH /usr/local/lib:/usr/local/lib64 WORKDIR /villas -ENTRYPOINT bash