Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
JenkinsConfiguration
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
JenkinsConfiguration
Commits
36f42ce3
Commit
36f42ce3
authored
5 years ago
by
Martin Christoph Hierholzer
Browse files
Options
Downloads
Patches
Plain Diff
install newest mesion version from pip, required for libgul
parent
e99cfaab
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dockerfiles/bionic.docker
+4
-3
4 additions, 3 deletions
dockerfiles/bionic.docker
dockerfiles/xenial.docker
+4
-3
4 additions, 3 deletions
dockerfiles/xenial.docker
with
8 additions
and
6 deletions
dockerfiles/bionic.docker
+
4
−
3
View file @
36f42ce3
...
...
@@ -9,8 +9,8 @@ RUN apt-get update && \
apt-get update
&&
\
apt-get upgrade
-y
&&
\
apt-get dist-upgrade
-y
&&
\
apt-get
install
-y
sudo
wget
&&
\
apt-get install -y g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake
meson
ninja-build && \
apt-get
install
-y
sudo
wget
python3-pip
&&
\
apt-get install -y g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build && \
apt-get install -y libboost-all-dev libxml++2.6-dev && \
apt-get install -y libldap2-dev libzmq3-dev rpcbind && \
apt-get install -y libreadline-dev && \
...
...
@@ -33,7 +33,8 @@ RUN apt-get update && \
apt-get install -y vim-common && \
apt-get install -y netcat-openbsd && \
useradd -u 30996 msk_jenkins && \
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3 \
pip3 install meson
RUN
echo
"Defaults set_home"
>>
/etc/sudoers
&&
\
echo
'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";'
>
/etc/apt/apt.conf
&&
\
...
...
This diff is collapsed.
Click to expand it.
dockerfiles/xenial.docker
+
4
−
3
View file @
36f42ce3
...
...
@@ -10,8 +10,8 @@ RUN apt-get update && \
apt-get update
&&
\
apt-get upgrade
-y
&&
\
apt-get dist-upgrade
-y
&&
\
apt-get
install
-y
sudo
wget
&&
\
apt-get
install
-y
g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake
meson/xenial-backports
ninja-build
&&
\
apt-get
install
-y
sudo
wget
python3-pip
&&
\
apt-get
install
-y
g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build
&&
\
apt-get
install
-y
libboost-all-dev libxml++2.6-dev
&&
\
apt-get
install
-y
libldap2-dev libzmq3-dev rpcbind
&&
\
apt-get
install
-y
libreadline-dev
&&
\
...
...
@@ -34,7 +34,8 @@ RUN apt-get update && \
apt-get
install
-y
vim-common
&&
\
apt-get
install
-y
netcat-openbsd
&&
\
useradd
-u
30996 msk_jenkins
&&
\
ln
-sfn
/usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
ln
-sfn
/usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
\
pip3
install
meson
RUN
echo
"Defaults set_home"
>>
/etc/sudoers
&&
\
echo
'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";'
>
/etc/apt/apt.conf
&&
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment