Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
tango
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira issues
Open Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
tango
Commits
29b4fbae
Commit
29b4fbae
authored
4 years ago
by
Jan David Mol
Browse files
Options
Downloads
Patches
Plain Diff
L2SS-230
: Use nproc for parallel make, pull fixed tag for open62541 opc-ua lib
parent
b17b6577
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!48
Resolve L2SS-230 "Add sdp sim"
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
docker-compose/sdptr-sim/Dockerfile
+3
-3
3 additions, 3 deletions
docker-compose/sdptr-sim/Dockerfile
with
3 additions
and
3 deletions
docker-compose/sdptr-sim/Dockerfile
+
3
−
3
View file @
29b4fbae
...
@@ -5,11 +5,11 @@ RUN apt-get update && \
...
@@ -5,11 +5,11 @@ RUN apt-get update && \
apt-get clean
apt-get clean
# Install OPC-UA lib
# Install OPC-UA lib
RUN
git clone
--depth
1 https://github.com/open62541/open62541
&&
\
RUN
git clone
--depth
1
--branch
1.2
https://github.com/open62541/open62541
&&
\
cd
/open62541
&&
\
cd
/open62541
&&
\
git submodule update
--init
--recursive
&&
\
git submodule update
--init
--recursive
&&
\
mkdir
build
&&
cd
build
&&
\
mkdir
build
&&
cd
build
&&
\
cmake ..
-DBUILD_SHARED_LIBS
=
ON
-DCMAKE_BUILD_TYPE
=
RelWithDebInfo
-DUA_NAMESPACE_ZERO
=
FULL
-DUA_MULTITHREADING
=
100
&&
make
-j
4
install
bash
-c
"
cmake .. -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUA_NAMESPACE_ZERO=FULL -DUA_MULTITHREADING=100 && make -j
`
nproc
`
install
"
# Update shared library cache
# Update shared library cache
RUN
ldconfig
RUN
ldconfig
...
@@ -20,7 +20,7 @@ RUN cd / && git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/s
...
@@ -20,7 +20,7 @@ RUN cd / && git clone --depth 1 --branch master https://git.astron.nl/lofar2.0/s
RUN
cd
/sdptr
&&
\
RUN
cd
/sdptr
&&
\
autoreconf
-v
-f
-i
&&
\
autoreconf
-v
-f
-i
&&
\
./configure
&&
\
./configure
&&
\
make
-j
4
install
bash
-c
"
make -j
`
nproc
`
install
"
WORKDIR
/sdptr/src
WORKDIR
/sdptr/src
CMD
["sdptr", "--configfile=uniboard.conf", "--nodaemon"]
CMD
["sdptr", "--configfile=uniboard.conf", "--nodaemon"]
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