Merge pull request #8 from millaguie/docker

Add support for configuration from directory instead a git repo

Dockerfile

@@ -10,7 +10,7 @@ RUN apt update && \
     cd /opt && \
     rm -rf /usr/src/dmr_utils3 && \
     git clone https://github.com/n0mjs710/hblink3
-
+ENV AAA BBBB
 RUN cd /opt/hblink3/ && \
     sed -i s/.*python.*//g  requirements.txt && \
     pip install --no-cache-dir -r requirements.txt
@@ -24,8 +24,6 @@ RUN adduser -u 54000 radio && \
     chown radio:radio /entrypoint && \
     chown radio /opt/hblink3
 
-RUN chmod 755 /entrypoint
-
 USER radio 
 EXPOSE 54000
 

entrypoint

@@ -1,10 +1,19 @@
 #!/bin/sh
 
-mkdir -p /var/tmp/config 
+if [ -z "$GIT_REPO" ]; then
-cd /var/tmp/config
+  mkdir -p /var/tmp/config 
-git clone https://${GIT_USER}:${GIT_PASSWORD}@${GIT_REPO}
+  cd /var/tmp/config
+  git clone https://${GIT_USER}:${GIT_PASSWORD}@${GIT_REPO}
 
-DIR=$(echo ${GIT_REPO}| sed s/.git$//g | sed s#^.*/##g)
+  DIR=$(echo ${GIT_REPO}| sed s/.git$//g | sed s#^.*/##g)
 
-cp -a /var/tmp/config/${DIR}/*cfg /opt/hblink3/
+  cp -a /var/tmp/config/${DIR}/*cfg /opt/hblink3/
-python /opt/hblink3/hblink.py
+  cp -a /var/tmp/config/${DIR}/*csv /opt/hblink3/
+  cp -a /var/tmp/config/${DIR}/*json /opt/hblink3/
+else
+  cp -a /opt/config/*cfg /opt/hblink3/
+  cp -a /opt/config/*csv /opt/hblink3/
+  cp -a /opt/config/*json /opt/hblink3/
+fi
+cd /opt/hblink3
+python /opt/hblink3/hblink.py -c hblink.cfg