Fixes RPi docker files and adds RPi docker compose file

daq/Dockerfile

@@ -3,14 +3,10 @@ FROM python:latest
 # Copy source files
 RUN mkdir /root/tag-logger
 COPY taglogger.py /root/tag-logger/taglogger.py
-# COPY pycomm-master /tmp/pycomm
-# COPY Pycomm-Helper /tmp/pycomm_helper
 
 # Install some python packages
 RUN pip install requests
 RUN pip install git+https://github.com/Henry-Pump/Pycomm-Helper.git
 RUN pip install git+https://github.com/ruscito/pycomm.git
-RUN cd /tmp/pycomm && python setup.py install && cd /
-RUN cd /tmp/pycomm_helper && python setup.py install && cd /
 
 CMD ["python", "/root/tag-logger/taglogger.py"]

daq/Dockerfile.rpi

@@ -1,14 +1,15 @@
-FROM patrickjmcd/rpi-python3:latest
+FROM armv7/armhf-ubuntu
 
-# Copy source files 
+# Copy source files
 RUN mkdir /root/tag-logger
 COPY taglogger.py /root/tag-logger/taglogger.py
-COPY pycomm-master /tmp/pycomm
-COPY pycomm_helper /tmp/pycomm_helper
+RUN apt-get update && apt-get install -y python python-pip git
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install some python packages
+RUN pip install --upgrade pip
 RUN pip install requests
-RUN cd /tmp/pycomm && python setup.py install && cd /
-RUN cd /tmp/pycomm_helper && python setup.py install && cd /
+RUN pip install git+https://github.com/Henry-Pump/Pycomm-Helper.git
+RUN pip install git+https://github.com/ruscito/pycomm.git
 
 CMD ["python", "/root/tag-logger/taglogger.py"]

daq/Dockerfile.ubuntu

@@ -1,14 +1,12 @@
 FROM python:latest
 
-# Copy source files 
+# Copy source files
 RUN mkdir /root/tag-logger
 COPY taglogger.py /root/tag-logger/taglogger.py
-COPY pycomm-master /tmp/pycomm
-COPY pycomm_helper /tmp/pycomm_helper
 
 # Install some python packages
 RUN pip install requests
-RUN cd /tmp/pycomm && python setup.py install && cd /
-RUN cd /tmp/pycomm_helper && python setup.py install && cd /
+RUN pip install git+https://github.com/Henry-Pump/Pycomm-Helper.git
+RUN pip install git+https://github.com/ruscito/pycomm.git
 
 CMD ["python", "/root/tag-logger/taglogger.py"]

docker-compose-rpi.yml

@@ -0,0 +1,23 @@
+version : '2'
+services:
+    web_db:
+        image: docker.henrypump.cloud/datalogger/rpi-web_db
+        ports:
+            - "443:5000"
+    daq:
+        image: docker.henrypump.cloud/datalogger/rpi-daq
+        depends_on:
+            - web_db
+        links:
+            - web_db
+
+
+# networks:
+#     poconsole:
+#         driver: bridge
+#         driver_opts:
+#             com.docker.network.enable_ipv4: "true"
+#         ipam:
+#             driver: default
+#             config:
+#             - subnet: 10.10.10.0/24

web_db/Dockerfile

@@ -20,4 +20,4 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN service mysql restart && python /root/tag-logger/flask/setupdb.py
 
-CMD '/root/startup.sh'
+CMD ["/root/startup.sh"]

web_db/Dockerfile.rpi

@@ -1,8 +1,10 @@
-FROM patrickjmcd/rpi-python3:latest
+FROM armv7/armhf-ubuntu
 
 RUN apt-get -y update
 COPY mysql-install.sh /tmp/mysql-install.sh
 RUN chmod +x /tmp/mysql-install.sh && /tmp/mysql-install.sh
+RUN apt-get install -y python python-pip git libffi-dev libssl-dev
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN mkdir /root/tag-logger
 COPY flask /root/tag-logger/flask
@@ -20,4 +22,4 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN service mysql restart && python /root/tag-logger/flask/setupdb.py
 
-CMD '/root/startup.sh'
+CMD ["/root/startup.sh"]

web_db/Dockerfile.ubuntu

@@ -20,4 +20,4 @@ RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 RUN service mysql restart && python /root/tag-logger/flask/setupdb.py
 
-CMD '/root/startup.sh'
+CMD ["/root/startup.sh"]