- Ignore news when they start with a comment #

- Build the image in place without downloading the entire thing from git
- connect the buildfile with the docker-compose.yml
- silence some old news

Author: ggilestro

Docker/resource_server/Dockerfile

@@ -3,15 +3,10 @@ FROM python:3
 
 # Clone the repository from GitHub
 RUN apt-get update && \
-    apt-get install -y git host nano && \
-    git clone https://github.com/gilestrolab/ethoscope.git /opt/ethoscope && \
-    cd /opt/ethoscope && \
-    git checkout dev && \
-    ln -s /opt/ethoscope/scripts/resource_server /opt/ethoscope_resources
+    apt-get install -y git host nano
 
-# Change to the script's directory
-# It is reccomended to mount this folder locally when running the container
-WORKDIR /opt/ethoscope_resources
+RUN mkdir -p /opt/ethoscope_resources
+COPY ./pa_server.py ./index_template.html /opt/ethoscope_resources/
 
 # Install any needed packages specified in requirements.txt
 # Uncomment the following line if there is a requirements.txt in the repository
@@ -21,8 +16,11 @@ RUN pip install --no-cache-dir bottle
 # Make port 8080 available to the world outside this container
 EXPOSE 8080
 
+# Change to the script's directory
+# It is reccomended to mount this folder locally when running the container
+WORKDIR /opt/ethoscope_resources
+
 # Run pa_server.py when the container launches
 CMD ["python", "pa_server.py", "--debug", "--port", "8080", "--log", "/opt/ethoscope_resources/contents/", "--static", "/opt/ethoscope_resources"]
 
-
-# docker build -t ethoscope-resources . --no-cache
+# docker build -t ethoscope-resources . --no-cache

Docker/resource_server/contents/news.txt

@@ -1,3 +1,3 @@
-2020-06-25;We now have a notification service
-2020-06-26;Please be aware that there are issues with the raspberry PI 3 and the PINoIR camera version 2. Follow the github issue #97 for updates.
-2020-07-02;The new stable branch is now master. Starting from yesterday's image, all your ethoscopes and node will migrate from python3.7 to master for the future. Switch to dev if you want to experience the new features as we use them in the gilestro lab.
+#2020-06-25;We now have a notification service
+#2020-06-26;Please be aware that there are issues with the raspberry PI 3 and the PINoIR camera version 2. Follow the github issue #97 for updates.
+#2020-07-02;The new stable branch is now master. Starting from yesterday's image, all your ethoscopes and node will migrate from python3.7 to master for the future. Switch to dev if you want to experience the new features as we use them in the gilestro lab.

Docker/resource_server/docker-compose.yml

@@ -2,12 +2,14 @@ version: '3'
 
 services:
   ethoscope-resources:
+    build: .
     image: ethoscope-resources
     container_name: ethoscope-resources
     restart: always
     expose:
       - 8080
     volumes:
+#      - ./:/opt/ethoscope_resources
       - ./contents:/opt/ethoscope_resources/contents
     environment:
       - VIRTUAL_HOST=ethoscope-resources.lab.gilest.ro

Docker/resource_server/pa_server.py

@@ -29,7 +29,7 @@
 news = []
 with open(news_file, "r") as nf:
     for line in nf.readlines():
-        if ";" in line:
+        if not line.startswith("#") and ";" in line:
             news.append ( {"content" : line.split(";")[1], "date": line.split(";")[0]} )
 
 @app.hook('after_request')