dockerfile improvements

AUTHORS.rst

@@ -4,3 +4,4 @@ Contributors
 
 * Christian Darsow-Fromm <christian.darsow@physik.uni-hamburg.de>
 * Sebastian Steinlechner <sebastian.steinlechner@physnet.uni-hamburg.de>
+* Luis Dekant <ldekant@physnet.uni-hamburg.de>

Dockerfile

-FROM python:3
+FROM lasnq/nqontrol:lib
 ENV PYTHONUNBUFFERED 1
 ENV BUILD_PACKAGES pandoc sass rsync openssh-client build-essential python3-tk
 
-RUN mkdir /code
 WORKDIR /code
 
 RUN apt-get update -y && apt-get install -y $BUILD_PACKAGES
 
-COPY ./env/adwin-lib*.tar.gz /code/
-
-RUN tar -xvf adwin-lib*.tar.gz
-WORKDIR /code/adwin-lib/
-RUN ./configure
-RUN make
-RUN make install
-
-WORKDIR /code
-
+# Install Python packages
 RUN pip install --upgrade pip
 ADD requirements.txt Makefile /code/
 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

Dockerfile_lib

+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

build_docker.sh

 #!/usr/bin/env bash
 set -e
 
-project=nqontrol
+project=nqontrol:lib
 
-docker build -t $project .
+docker build -t $project -f Dockerfile_lib .
 docker tag $project lasnq/$project
 docker push lasnq/$project
 
-cd env
-project=nqontrol:lib
+project=nqontrol
 
 docker build -t $project .
 docker tag $project lasnq/$project