split skosmos and vocab loader containers

.gitignore

@@ -7,3 +7,4 @@ data/*.ttl
 data/*.trig
 data/*.config
 data/*.yaml
+data/*.yaml.bak

Dockerfile

@@ -1,12 +1,12 @@
-FROM library/php:7.3-apache
+FROM library/php:8.1-apache
 
 # set skosmos release version and download link
 ARG version=v2.18.1-1.0.0
 ARG SKOSMOS_TARGZ_RELEASE_URL=https://github.com/knaw-huc/Skosmos/archive/refs/tags/${version}.tar.gz
 
 # general server setup and locale
 RUN apt-get update && \
-  apt-get -y install gettext locales curl unzip vim git libicu-dev libxslt-dev python3 pip cron && \
+  apt-get -y install gettext locales curl unzip vim git libicu-dev libxslt-dev && \
   for locale in en_GB en_US fi_FI fr_FR sv_SE; do \
     echo "${locale}.UTF-8 UTF-8" >> /etc/locale.gen ; \
   done && \
@@ -33,9 +33,6 @@ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local
 # Install Skosmos dependencies
 RUN /usr/local/bin/composer install --no-dev --no-interaction
 
-COPY requirements.txt /var/www/
-# Install python dependencies
-RUN /usr/bin/env pip install -r /var/www/requirements.txt
 
 # Configure Skosmos
 COPY skosmos-repository.ttl /var/www/
@@ -45,9 +42,4 @@ COPY ./src /var/www/src
 COPY entrypoint.py /var/www/
 COPY config-docker-compose.ttl /var/www/html/
 
-# Prepare CRON
-COPY crontab /var/www/crontab
-COPY entrypoint_cron.sh /var/www/
-COPY crontask.sh /var/www/
-
 ENTRYPOINT ["/var/www/entrypoint.sh"]

crontab

@@ -1,4 +1,4 @@
 SPARQL_ENDPOINT=$SPARQL_ENDPOINT
 DATA=$DATA
 
-0 * * * * /var/www/crontask.sh >> /var/log/cron.log 2>&1
+0 * * * * /app/crontask.sh >> /var/log/cron.log 2>&1

docker-compose.yml

@@ -37,11 +37,12 @@ services:
       - skosmos-configuration:/config
     depends_on:
       - graphdb
-  skosmos-cron:
-    container_name: 'skosmos-cron'
+      - vocab-loader
+  vocab-loader:
+    container_name: 'vocab-loader'
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: loader.Dockerfile
     environment:
       - SPARQL_ENDPOINT=http://host.docker.internal:7200/repositories/skosmos
       - DATA=${DATA:-/data}
@@ -50,8 +51,8 @@ services:
     volumes:
       - ./data:/data
       - skosmos-configuration:/config
-    entrypoint:
-      - /var/www/entrypoint_cron.sh
+    depends_on:
+      - graphdb
 
 networks:
   skosmos:

entrypoint.py

@@ -42,7 +42,7 @@ def main() -> None:
     if os.path.isfile(f'{data}/config.ttl'):
         shutil.copy(f'{data}/config.ttl', '/config/config-docker-compose.ttl')
     else:
-        shutil.copy('/var/www/html/config-docker-compose.ttl', '/config/config-docker-compose.ttl')
+        shutil.copy('/app/config-docker-compose.ttl', '/config/config-docker-compose.ttl')
 
     if os.path.isfile(f'{data}/config-ext.ttl'):
         with open(f'{data}/config-ext.ttl', 'r', encoding='utf-8') as f:

entrypoint.sh

@@ -3,9 +3,9 @@ set -x
 
 ls -al $DATA
 
-/var/www/entrypoint.py
-
-/usr/bin/envsubst < /config/config-docker-compose.ttl > /config/config.ttl
+#/var/www/entrypoint.py
+#
+#/usr/bin/envsubst < /config/config-docker-compose.ttl > /config/config.ttl
 
 ln -s /config/config.ttl /var/www/html/config.ttl
 cat /var/www/html/config.ttl

entrypoint_cron.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-/usr/bin/envsubst < /var/www/crontab > /etc/cron.d/crontab
+/usr/bin/envsubst < /app/crontab > /etc/cron.d/crontab
+
+/app/entrypoint.py
+
+/usr/bin/envsubst < /config/config-docker-compose.ttl > /config/config.ttl
 
 crontab /etc/cron.d/crontab
 touch /var/log/cron.log

loader.Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.10
+
+RUN apt-get update && apt-get -y install cron gettext
+
+WORKDIR /app
+
+COPY crontab /app/crontab
+COPY entrypoint_cron.sh /app/
+COPY config-docker-compose.ttl /app/
+COPY skosmos-repository.ttl /app/
+COPY crontask.sh /app/
+
+COPY src /app/src
+COPY entrypoint.py /app/entrypoint.py
+
+COPY requirements.txt /app/
+RUN pip install -r /app/requirements.txt
+
+ENTRYPOINT ["/app/entrypoint_cron.sh"]

src/graphdb.py

@@ -25,7 +25,7 @@ def setup_graphdb() -> None:
         headers = {
             'Content-Type': 'text/turtle',
         }
-        with open("/var/www/skosmos-repository.ttl", "rb") as fp:
+        with open("/app/skosmos-repository.ttl", "rb") as fp:
             requests.put(
                 f"{endpoint}",
                 headers=headers,