From 06b4ede3e7b15346fbbe6a5f559edab7b52b5866 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 4 Oct 2018 00:44:18 +0200 Subject: [PATCH] docker: use new fedora package repo --- packaging/docker/Dockerfile.dev | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packaging/docker/Dockerfile.dev b/packaging/docker/Dockerfile.dev index 2afcb3eed..9621cbd86 100644 --- a/packaging/docker/Dockerfile.dev +++ b/packaging/docker/Dockerfile.dev @@ -36,12 +36,7 @@ ARG VERSION=unknown ARG VARIANT=unknown # Some of the dependencies are only available in our own repo -ADD https://packages.fein-aachen.org/redhat/fein.repo /etc/yum.repos.d/ - -# We need to use our own RPM packages of libwebsockets -# as the official ones do contain the CMake files -RUN dnf -y install --repo=fein \ - libwebsockets-2.4.2 +ADD https://packages.fein-aachen.org/fedora/fein.repo /etc/yum.repos.d/ # Toolchain RUN dnf -y install \ @@ -76,15 +71,16 @@ RUN dnf -y install \ libcurl-devel \ jansson-devel \ zeromq-devel \ - nanomsg-devel \ protobuf-devel \ protobuf-c-devel \ - libiec61850-devel \ librabbitmq-devel \ mosquitto-devel \ comedilib-devel comedilib \ libibverbs-devel \ - librdmacm-devel + librdmacm-devel \ + libwebsockets-devel \ + nanomsg \ + libiec61850 # Build & Install Criterion RUN cd /tmp && \