Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
NQontrol
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
las-nq
NQontrol
Commits
14eb420f
Commit
14eb420f
authored
Mar 6, 2019
by
Christian Darsow-Fromm
Browse files
Options
Downloads
Patches
Plain Diff
dockerfile improvements
parent
6c4a83dd
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
AUTHORS.rst
+1
-0
1 addition, 0 deletions
AUTHORS.rst
Dockerfile
+5
-13
5 additions, 13 deletions
Dockerfile
Dockerfile_lib
+15
-0
15 additions, 0 deletions
Dockerfile_lib
build_docker.sh
+3
-4
3 additions, 4 deletions
build_docker.sh
with
24 additions
and
17 deletions
AUTHORS.rst
+
1
−
0
View file @
14eb420f
...
@@ -4,3 +4,4 @@ Contributors
...
@@ -4,3 +4,4 @@ Contributors
* Christian Darsow-Fromm <christian.darsow@physik.uni-hamburg.de>
* Christian Darsow-Fromm <christian.darsow@physik.uni-hamburg.de>
* Sebastian Steinlechner <sebastian.steinlechner@physnet.uni-hamburg.de>
* Sebastian Steinlechner <sebastian.steinlechner@physnet.uni-hamburg.de>
* Luis Dekant <ldekant@physnet.uni-hamburg.de>
This diff is collapsed.
Click to expand it.
Dockerfile
+
5
−
13
View file @
14eb420f
FROM
python:3
FROM
lasnq/nqontrol:lib
ENV
PYTHONUNBUFFERED 1
ENV
PYTHONUNBUFFERED 1
ENV
BUILD_PACKAGES pandoc sass rsync openssh-client build-essential python3-tk
ENV
BUILD_PACKAGES pandoc sass rsync openssh-client build-essential python3-tk
RUN
mkdir
/code
WORKDIR
/code
WORKDIR
/code
RUN
apt-get update
-y
&&
apt-get
install
-y
$BUILD_PACKAGES
RUN
apt-get update
-y
&&
apt-get
install
-y
$BUILD_PACKAGES
COPY
./env/adwin-lib*.tar.gz /code/
# Install Python packages
RUN
tar
-xvf
adwin-lib
*
.tar.gz
WORKDIR
/code/adwin-lib/
RUN
./configure
RUN
make
RUN
make
install
WORKDIR
/code
RUN
pip
install
--upgrade
pip
RUN
pip
install
--upgrade
pip
ADD
requirements.txt Makefile /code/
ADD
requirements.txt Makefile /code/
RUN
make requirements
RUN
make requirements
RUN
/opt/adwin/sbin/adconfig add 1 TYPE net IP 192.168.0.3
# Configure ADwin device
ENV
adwin_ip_address 192.168.0.3
RUN
/opt/adwin/sbin/adconfig add 1 TYPE net IP
$adwin_ip_address
This diff is collapsed.
Click to expand it.
Dockerfile_lib
0 → 100644
+
15
−
0
View file @
14eb420f
FROM python:3
ENV adwin_version 5.0.12
WORKDIR /code
# Install ADwin library
RUN wget https://www.adwin.de/pub/cd/adwin-lib-$adwin_version.tar.gz
RUN tar -xvf adwin-lib-$adwin_version.tar.gz
WORKDIR /code/adwin-lib-$adwin_version/
RUN ./configure
RUN make
RUN make install
WORKDIR /code
This diff is collapsed.
Click to expand it.
build_docker.sh
+
3
−
4
View file @
14eb420f
#!/usr/bin/env bash
#!/usr/bin/env bash
set
-e
set
-e
project
=
nqontrol
project
=
nqontrol
:lib
docker build
-t
$project
.
docker build
-t
$project
-f
Dockerfile_lib
.
docker tag
$project
lasnq/
$project
docker tag
$project
lasnq/
$project
docker push lasnq/
$project
docker push lasnq/
$project
cd env
project
=
nqontrol
project
=
nqontrol:lib
docker build
-t
$project
.
docker build
-t
$project
.
docker tag
$project
lasnq/
$project
docker tag
$project
lasnq/
$project
...
...
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