Moved the docker files to their own folder

Allow to specify location of the static content in the web server

Author: ggilestro

Dockerfile Docker/Dockerfile

@@ -9,16 +9,18 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 RUN pip install bottle pandas
+RUN git clone https://github.com/gilestrolab/ethoscope_metadata_db.git /opt/ethoscope_metadata_db
 
-WORKDIR /opt
-RUN git clone https://github.com/gilestrolab/ethoscope_metadata_db.git
+WORKDIR /opt/ethoscope_metadata_db
 RUN pip install -e .
 
-WORKDIR /opt/ethoscope_metadata_db
 CMD ["python", "/opt/ethoscope_metadata_db/ethoscope_metadata_db/metadata_db_server.py", "--refresh", "--metadata", "/opt/ethoscope_metadata"]
 
-
-# sudo docker run -d -p 8081:8081 \
+# Build and run with 
+#
+# docker build -t ethoscope_metadata_server-lab.gilest.ro . --no-cache
+#
+# docker run -d -p 8081:8081 \
 #       --name ethoscope-metadata-server \
 #       --volume /mnt/data/results:/mnt/ethoscope_results:ro \
 #       --volume /mnt/data/ethoscope_metadata:/opt/ethoscope_metadata \

Docker/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3.8'
+
+services:
+  ethoscope-metadata-server:
+    container_name: ethoscope-metadata-server
+    image: ethoscope_metadata_server-lab.gilest.ro
+    volumes:
+      - /mnt/data/results:/mnt/ethoscope_results:ro
+      - /mnt/data/ethoscope_metadata:/opt/ethoscope_metadata
+    ports:
+      - "8081:8081"
+    environment:
+      VIRTUAL_HOST: "metadata.lab.gilest.ro"
+      VIRTUAL_PORT: "8081"
+      LETSENCRYPT_HOST: "metadata.lab.gilest.ro"
+      LETSENCRYPT_EMAIL: "giorgio@gilest.ro"
+    restart: unless-stopped
+    networks:
+      name: nginx-proxy
+      external: True

ethoscope_metadata_db/metadata_db_server.py

@@ -36,7 +36,6 @@
     from metadata_db import db_organiser, metadata_handler, metadata_crawler
 
 app = bottle.Bottle()
-STATIC_DIR = "./static"
 
 @app.route('/static/<filepath:path>')
 def server_static(filepath):
@@ -165,6 +164,7 @@ def close(exit_status=0):
     parser = optparse.OptionParser()
     parser.add_option("-d", "--db", dest="db_path", default="/mnt/ethoscope_results", help="Path to the root of the ethoscope db files")
     parser.add_option("-m", "--metadata", dest="md_path", default="/opt/ethoscope_metadata", help="Path to the root of the metadata files")
+    parser.add_option("--static", dest="static_path", default="/opt/ethoscope_metadata_db/ethoscope_metadata_db", help="Path to the root of the static folder")
     parser.add_option("-r", "--refresh", dest="refresh_db", default=False, help="Refresh ethoscope database on start", action="store_true")
 
     parser.add_option("-D", "--debug", dest="debug", default=False, help="Set DEBUG mode ON", action="store_true")
@@ -173,6 +173,7 @@ def close(exit_status=0):
     (options, args) = parser.parse_args()
 
     option_dict = vars(options)
+    STATIC_DIR = os.path.join(option_dict["static_path"], "./static")
     DB_PATH = option_dict["db_path"]
     MD_PATH = option_dict["md_path"]
     REFRESH_DB = option_dict["refresh_db"]