add a parameter for container name

Chloé Azria
1 parent 7056e291
Showing 3 changed files with 17 additions and 12 deletions Show diff stats
conf/.env
conf/dachs-dockerfile
conf/docker-compose.yml
@@ -6,6 +6,9 @@ GITREPO_INSTITUTION=PADC
 GITREPO_SERVER=voparis-tap-example
+
+#########Be careful, the .env parameters have priority on gavo.rc from gitlab
+
 #Following parameters will take default values if commented :
 DACHS_PORT=81
 #default 80
@@ -14,9 +17,10 @@ APACHE_PORT=8081
 SERVERNAME=localhost
 #name of the host machine - default to localhost, for dev
 DOMAIN=
-#default to ""
+#default to empty string for localhost
 PROTOCOL=http
 #default to http
+CONTAINER_NAME=dachs_voparis
 #note the default ports inside the container will be binded to DACHS_PORT and AWSTATS_PORT of the host machine
@@ -66,7 +66,7 @@ RUN cp -r $HOMEPATH/services/* /var/gavo/inputs/
 ######
 ##Adapt 000-default.conf ports and maintainer (taken from gavo.rc)
-RUN export maintainerAddress=`grep "^maintainerAddress:" /etc/gavo.rc | cut -d ":" -f 2` && sed -i "s/webmaster@localhost/${maintainerAddress}/g" /etc/apache2/sites-enabled/000-default.conf && less /etc/apache2/sites-enabled/000-default.conf
+RUN export maintainerAddress=`grep "^maintainerAddress:" /etc/gavo.rc | cut -d ":" -f 2` && sed -i "s/webmaster@localhost/${maintainerAddress}/g" /etc/apache2/sites-enabled/000-default.conf 
 RUN sed -i "s/8080/${APACHE_PORT}/g" /etc/apache2/sites-enabled/000-default.conf
 ##Adapt ports.conf with APACHE PORT
@@ -85,12 +85,17 @@ RUN sed -i &quot;/serverPort/c\serverPort:${DACHS_PORT}&quot;  /etc/gavo.rc
 RUN sed -i "/corsOriginPat/c\corsOriginPat:${PROTOCOL}.*" /etc/gavo.rc
 RUN if [ "$SERVERNAME" = "localhost" ]; then \
+         less /etc/gavo.rc &&\
          sed -i "/serverURL/c\serverURL:" /etc/gavo.rc &&\
-         echo "############################ WARNING gavo.rc overwrite -- localhost for dev only ###############################" \  
+         echo "############################ WARNING gavo.rc overwrite -- use localhost for dev only ###############################" \
+         less /etc/gavo.rc \ 
     ; else \
+         less /etc/gavo.rc &&\
          sed -i "/serverURL/c\serverURL:${PROTOCOL}://${SERVERNAME}.${DOMAIN}:${DACHS_PORT}" /etc/gavo.rc &&\
-         echo "Warning : gavo.rc overwritten by .env servername, domain, protocol and port values" \
+         echo "Warning : gavo.rc overwritten by .env servername, domain, protocol and port values" &&\
+         less /etc/gavo.rc \
     ; fi
+    
 ###
 #dachs configuration
@@ -2,8 +2,8 @@ version: &quot;3.5&quot;
 services:
   dachs:
-    container_name: dachs-voparis
-    image: dachs-voparis
+    container_name: ${CONTAINER_NAME}
+    image: ${CONTAINER_NAME}
     tty: true
     expose:
@@ -27,12 +27,8 @@ services:
         - "DOMAIN=${DOMAIN}"
         - "PROTOCOL=${PROTOCOL}"
     volumes:
-      #- ../apache/cgi-bin:/home/dachsroot/apache/cgi-bin
       - ../apache/logapache:/var/log/apache2
       - ../apache/dachslogs:/var/gavo/logs
-      
       # example if you need to mount volumes (e.g if your service needs to parse files or if you want to upload it through dachs)
-      #- paht/to/data:/var/gavo/inputs/service/data
-      
-### To uncomment for production :
-#    restart: always
+      #- path/to/data:/var/gavo/inputs/<<service>>/data
+    restart: always