From 3cd3e4db6616a4e30c0380c294bfd8bc21730290 Mon Sep 17 00:00:00 2001
From: Samuel Meehan <smeehan12@gmail.com>
Date: Mon, 10 Feb 2020 18:43:39 +0100
Subject: [PATCH] addec jobs
---
.gitlab-ci.yml | 6 ++++++
Dockerfile | 17 ++++++++++++++++-
lcg.repo | 20 ++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 lcg.repo
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6de52eb..2447f6a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,3 +9,9 @@ build_image:
- docker-image-build
script:
- echo building image
+
+build_sam:
+ - package
+ script:
+ - docker build -t gitlab-registry.cern.ch/meehan/faser-docker-daq:latest .
+ - docker push gitlab-registry.cern.ch/meehan/faser-docker-daq:latest
diff --git a/Dockerfile b/Dockerfile
index d2b6475..6bccb5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,14 @@
-FROM atlas/centos7-atlasos:latest
+FROM gitlab-registry.cern.ch/ep-dt-di/daq/daqling:latest
+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 && \
rpm -i --nodeps ius-release.rpm && \
@@ -7,9 +16,11 @@ RUN cd /tmp/ && \
yum install -y git2u && \
yum clean all
+# libusb is for the GPIO boards
RUN yum install -y libusbx-devel && \
yum clean all
+# root is for the tracker scan routines
RUN yum install -y root && \
yum clean all
@@ -97,3 +108,7 @@ ENV HOME /home
COPY startup.sh $HOME/startup.sh
ENTRYPOINT ["/bin/bash", "/home/startup.sh","/bin/bash"]
+
+
+
+
\ No newline at end of file
diff --git a/lcg.repo b/lcg.repo
new file mode 100644
index 0000000..1d4c8de
--- /dev/null
+++ b/lcg.repo
@@ -0,0 +1,20 @@
+[lcg]
+name=LCG Repository
+baseurl=http://cern.ch/lcgpackages/rpms
+gpgcheck=0
+enabled=1
+protect=0
+
+[lcg-updates]
+name=LCG Repository
+baseurl=http://cern.ch/lcgpackages/rpms_updates
+gpgcheck=0
+enabled=1
+protect=0
+
+[lcg_contrib]
+name=LCG Contrib Repository
+baseurl=http://cern.ch/lcgpackages/rpms_contrib/
+gpgcheck=0
+enabled=1
+protect=0
--
GitLab