From 78ca4cd4ac47e5ccbeaefbc505644d5baaa47656 Mon Sep 17 00:00:00 2001
From: Jens Noerby Kristensen <jens.noerby.kristensen@cern.ch>
Date: Thu, 17 Jun 2021 13:28:31 +0000
Subject: [PATCH] Update Dockerfile
---
faser-daq/Dockerfile | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/faser-daq/Dockerfile b/faser-daq/Dockerfile
index 5fc2f48..32dd5dd 100644
--- a/faser-daq/Dockerfile
+++ b/faser-daq/Dockerfile
@@ -1,19 +1,13 @@
# start from the base daqling repository
# https://gitlab.cern.ch/ep-dt-di/daq/daqling/blob/develop/etc/Dockerfile
-FROM gitlab-registry.cern.ch/ep-dt-di/daq/daqling:latest
+FROM gitlab-registry.cern.ch/ep-dt-di/daq/daqling:cibase
# put all of the code within the /faser/daq directory in the image
ADD . /faser/daq
WORKDIR /faser/daq
-
-# get boost 1.70.0 from LCG
-COPY *.repo /etc/yum.repos.d/
-RUN yum install -y LCG_96b_Boost_1.70.0_x86_64_centos7_gcc8_opt && \
- export BOOST_ROOT_DIR=/opt/lcg/Boost/1.70.0-eebf1/x86_64-centos7-gcc8-opt && \
- export BOOST_VERSION=1.70
-
+
# get an up to date version of Git
#RUN cd /tmp/ && \
# wget https://centos7.iuscommunity.org/ius-release.rpm && \
@@ -131,4 +125,4 @@ ENTRYPOINT ["/bin/bash", "/home/startup.sh","/bin/bash"]
-
\ No newline at end of file
+
--
GitLab