Update project structure

.gitignore

@@ -1,6 +1,2 @@
-# Files
-# cqpserver.init
-
-# Directories
-data
-registry
+*.env
+volumes

.gitlab-ci.yml

@@ -15,7 +15,7 @@ before_script:
 
 Build:
   script:
-    - docker build --pull -t $CI_REGISTRY_IMAGE:tmp .
+    - docker build --pull -t $CI_REGISTRY_IMAGE:tmp build/cqpserver
     - docker push $CI_REGISTRY_IMAGE:tmp
   stage: build
   tags:

build/cqpserver/Dockerfile

@@ -35,7 +35,6 @@ RUN echo "yes" | cpan HTML::Entities && \
     cd ..
 
 
-COPY cqpserver.init /root/
 COPY docker-entrypoint.sh /usr/local/bin/
 
 

build/cqpserver/docker-entrypoint.sh

@@ -1,6 +1,13 @@
 #!/bin/bash
 
 if [ $# -eq 0 ]; then
+    CQPSERVER_HOST="${CQPSERVER_HOST:-*}"
+    CQPSERVER_PASSWORD="${CQPSERVER_PASSWORD:-}"
+    CQPSERVER_USER="${CQPSERVER_USER:-anonymous}"
+
+    echo "host ${CQPSERVER_HOST};" > /root/cqpserver.init
+    echo "user ${CQPSERVER_USER} \"${CQPSERVER_PASSWORD}\";" >> /root/cqpserver.init
+
     cqpserver -I /root/cqpserver.init
 elif [ $1 == "prepare" ]; then
   # Input:

cqpserver.init

@@ -1,3 +0,0 @@
-host *;
-
-user opaque "opaque";

cqpserver.init.tpl

@@ -1,3 +0,0 @@
-host *;
-
-user opaque "opaque";

docker-compose.yml

@@ -2,11 +2,12 @@ version: '3'
 
 services:
   cqpserver:
+    build: ./build/cqpserver
+    env_file: ./env_files/cqpserver.env
     image: gitlab.ub.uni-bielefeld.de:4567/sfb1288inf/cqpserver:latest
     ports:
       - 4877:4877
     volumes:
-      - ./cqpserver.init:/root/cqpserver.init
-      - ./data:/corpora/data
-      - ./files:/root/files
-      - ./registry:/usr/local/share/cwb/registry
+      - ./volumes/cqpserver/data:/corpora/data
+      - ./volumes/cqpserver/files:/root/files
+      - ./volumes/cqpserver/registry:/usr/local/share/cwb/registry

env_files/cqpserver.env.tpl

@@ -0,0 +1,3 @@
+CQPSERVER_HOST=
+CQPSERVER_PASSWORD=
+CQPSERVER_USER=