working with only the .env institution,server config

Chloé Azria
1 parent baef8fa2
Showing 5 changed files with 30 additions and 48 deletions Show diff stats
.env.example
dachs-dockerfile
defaultmeta.txt
docker-compose.yml
gavo.rc
 # enter here all key = value you need to path in docker-compose.yaml file - example for voparis-tap-planeto
 VERSION=11
-SERVER=voparis-tap-planeto
+#SERVER=voparis-tap-planeto
 # depot sans l'extension .git
-GIT=voparis-tap-planeto
-GITURL=https://voparis-gitlab.obspm.fr/dachs
+#GIT=voparis-tap-planeto
+#GITURL=https://voparis-gitlab.obspm.fr/dachs
 PUBKEY="your local public key"
 ARG VERSION
 FROM debian:$VERSION
  
-ARG SERVER
 ARG GITURL
-ARG GIT
+ARG SERVER
+ARG INSTITUTION
+
 ARG HOMEPATH=/home/dachsroot
 ARG PUBKEY
  
+
 ###
 #install de la clé + depot Dachs
 # ajout de postgres en amont sinon l'install de dachs plante
@@ -16,6 +18,7 @@ RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get install -y curl apt-utils
  
+# add dachs source
 RUN curl -o /etc/apt/trusted.gpg.d/gavo-archive.key.asc https://docs.g-vo.org/archive-key.asc
 RUN echo "deb http://vo.ari.uni-heidelberg.de/debian release main" > /etc/apt/sources.list.d/dachs.list
  
@@ -27,9 +30,7 @@ RUN echo &quot;deb http://vo.ari.uni-heidelberg.de/debian release main&quot; &gt; /etc/apt/so
 RUN apt-get -y update
 RUN apt-get -y upgrade
 RUN apt-get install -y postgresql-13 postgresql-13-q3c postgresql-13-pgsphere 
-#RUN service postgresql restart
 RUN apt-get install -y git wget awstats net-tools vim
-#RUN apt-get install -y gavodachs2-server
 RUN service postgresql restart && apt-get install -y gavodachs2-server
 RUN apt-get install -y openssh-server openssh-client apache2 w3m 
  
@@ -55,21 +56,33 @@ RUN chown dachsroot:gavo -R /home/dachsroot/.ssh
 # Installation des sources
 ###
  
-#RUN mkdir $PATH$SERVER -p
-#RUN git clone $GITURL/$GIT.git $HOMEPATH/$SERVER/$GIT
+#copy the configuration files into the docker
 COPY . $HOMEPATH
  
  
+#import dachs server configuration files from git
+RUN echo $GITURL/vespa/dachs/servers/$INSTITUTION/$SERVER.git
+RUN git clone $GITURL/vespa/dachs/servers/$INSTITUTION/$SERVER.git $HOMEPATH/server
+
+
+
 #on déplace les fichiers
+# dachs server configuration
 RUN cp $HOMEPATH/000-default.conf /etc/apache2/sites-enabled/000-default.conf
 RUN cp $HOMEPATH/ports.conf /etc/apache2/ports.conf
 RUN cp $HOMEPATH/awstats.dachs.conf /etc/awstats/awstats.dachs.conf
-RUN cp $HOMEPATH/gavo.rc /etc/gavo.rc
+RUN cp $HOMEPATH/server/gavo.rc /etc/gavo.rc
 RUN cp $HOMEPATH/docker-entrypoint.sh /usr/bin/docker-entrypoint.sh
 RUN chmod +x /usr/bin/docker-entrypoint.sh
-RUN cp $HOMEPATH/defaultmeta.txt /var/gavo/etc/defaultmeta.txt
+RUN cp $HOMEPATH/server/defaultmeta.txt /var/gavo/etc/defaultmeta.txt
 RUN mkdir /var/gavo/web/nv_static/img/ -p
 RUN cp $HOMEPATH/logo* /var/gavo/web/nv_static/img/
+
+
+#import services from git
+#clone all repositories from the group -- only if the gitlab project is Public
+RUN wget -O $HOMEPATH/group.json $GITURL'/api/v4/groups/vespa%2Fdachs%2Fservices%2F'$INSTITUTION'%2F'$SERVER
+RUN mkdir $HOMEPATH/services/ && cd $HOMEPATH/services/ && egrep -o 'https://[^"]+\.git' $HOMEPATH/group.json|xargs -n 1 -P 8 git clone
 RUN cp -r $HOMEPATH/services/* /var/gavo/inputs/
  
 ###
@@ -98,14 +111,14 @@ RUN chgrp 755 /etc/cron.daily/awstats
  
  
 ###
-# Script de démarrage des servcices
+# Script de démarrage des services
 ###
  
-#RUN echo "cd $HOMEPATH/$SERVER/$GIT/" >> /usr/bin/docker-entrypoint.sh
-#RUN echo "git pull" >> /usr/bin/docker-entrypoint.sh
+RUN echo "cd $HOMEPATH/$SERVER/$GIT/" >> /usr/bin/docker-entrypoint.sh
+RUN echo "git pull" >> /usr/bin/docker-entrypoint.sh
  
 # ajout au script pour maintenir docker up
-#RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh
+RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh
  
  
 ENTRYPOINT /usr/bin/docker-entrypoint.sh && tail -f /dev/null
@@ -1,19 +0,0 @@
-publisher: Paris Astronomical Data Centre
-publisherID: ivo://vopdc.obspm
-contact.name: PADC support team
-contact.address: 77 av. Denfert Rochereau, 75014 Paris, FRANCE
-contact.email: vo.paris@obspm.fr 
-contact.telephone: 0033140512082
-creator.name: PADC
-creator.logo: http://voparis-srv-paris.obspm.fr/logos/PADC_small.png 
-authority.creationDate: 2012-01-09T12:53:33
-authority.title: Paris Astronomical Data Centre Authority
-authority.shortName: PADC
-authority.description: The Paris Astronomical Data Centre project aims at providing VO access to its databases ressources, at participating to international standards developments, at implementing VO compliant simulation codes, data visualization and analysis software. This Naming Authority is used to identify the resources provided by Paris Astronomical Data Centre at Observatoire de Paris, Paris, FRANCE
-authority.referenceURL: http://padc.obspm.fr
-authority.managingOrg: ivo://vopdc
-organization.title: Observatoire de Paris
-organization.description: Founded in 1667, the Observatoire de Paris is the largest national research center for astronomy.
-organization.referenceURL: http://www.obspm.fr
-site.description: The Paris Astronomical Data Centre project aims at providing VO access to its databases ressources, at participating to international standards developments, at implementing VO compliant simulation codes, data visualization and analysis software.
-
@@ -19,9 +19,10 @@ services:
       dockerfile: dachs-dockerfile
       args:
         - "VERSION=${VERSION}"
+        - "INSTITUTION=${INSTITUTION}"
         - "SERVER=${SERVER}"
         - "GITURL=${GITURL}"
-        - "GIT=${GIT}"
+        - "PUBKEY=${PUBKEY}"
     secrets:
       - source: id_rsa
 secrets:
@@ -1,13 +0,0 @@
-[general]
-rootDir: /var/gavo
-maintainerAddress: pierre.lesidaner@obspm.fr
-[web]
-bindAddress:
-serverPort: 80
-#serverURL: http://145.238.197.199:81
-serverURL: http://127.0.0.1:80
-sitename: portablelp
-corsOriginPat: http.*
-logFormat: combined
-[ivoa]
-authority: vopdc.obspm