CDPP / docker_dachs_server

Commit 5a28b0c3126be014a322913440efff9f08cfb2a5

Authored by Chloé Azria
1 parent 6b332479
Exists in master

translate dockerfile comments

Showing 2 changed files with 7 additions and 15 deletions   Show diff stats
Inline Side-by-side
.env
  Diff comments   View file @5a28b0c
... ... @@ -4,3 +4,4 @@ VERSION=11
4 4 #as it is in github path
5 5 INSTITUTION=PADC
6 6 SERVER=voparis-tap-example
  7 +DOMAIN=obspm.fr
... ...
dachs-dockerfile
  Diff comments   View file @5a28b0c
... ... @@ -20,7 +20,6 @@ RUN echo "deb http://vo.ari.uni-heidelberg.de/debian release main" > /etc/apt/so
20 20 ###
21 21 # Server Configuration
22 22 ###
23   -
24 23 RUN apt-get -y update
25 24 RUN apt-get -y upgrade
26 25 RUN apt-get install -y postgresql-13 postgresql-13-q3c postgresql-13-pgsphere
... ... @@ -29,22 +28,15 @@ RUN service postgresql restart && apt-get install -y gavodachs2-server
29 28 RUN apt-get install -y openssh-server openssh-client apache2 w3m
30 29  
31 30  
32   -###
33   -# Installation des sources
34   -###
35   -
36 31 #copy the configuration files into the docker
37 32 COPY . $HOMEPATH
38 33  
39   -
40 34 #import dachs server configuration files from git
41 35 RUN echo $GITURL/vespa/dachs/servers/$INSTITUTION/$SERVER.git
42 36 RUN git clone $GITURL/vespa/dachs/servers/$INSTITUTION/$SERVER.git $HOMEPATH/server
43 37  
44 38  
45   -
46   -#on déplace les fichiers
47   -# dachs server configuration
  39 +# copy files at the right path
48 40 RUN cp $HOMEPATH/000-default.conf /etc/apache2/sites-enabled/000-default.conf
49 41 RUN cp $HOMEPATH/ports.conf /etc/apache2/ports.conf
50 42 RUN cp $HOMEPATH/awstats.dachs.conf /etc/awstats/awstats.dachs.conf
... ... @@ -63,7 +55,7 @@ RUN mkdir $HOMEPATH/services/ && cd $HOMEPATH/services/ && egrep -o 'https://[^"
63 55 RUN cp -r $HOMEPATH/services/* /var/gavo/inputs/
64 56  
65 57 ###
66   -#configuration de dachs
  58 +#dachs configuration
67 59 ###
68 60  
69 61 RUN chown dachsroot:gavo /var/gavo/etc/defaultmeta.txt
... ... @@ -72,14 +64,14 @@ RUN chown -R dachsroot:gavo /var/gavo/inputs/*
72 64  
73 65  
74 66 ###
75   -#configuration d'apache
  67 +#apache configuration
76 68 ###
77 69  
78 70 RUN a2enmod cgi
79 71  
80 72  
81 73 ###
82   -# maj auto des donnnées awstats par cron
  74 +# auto update awstats data using cron
83 75 ###
84 76  
85 77 RUN echo "#!/bin/bash" > /etc/cron.daily/awstats
... ... @@ -88,13 +80,12 @@ RUN chgrp 755 /etc/cron.daily/awstats
88 80  
89 81  
90 82 ###
91   -# Script de démarrage des services
  83 +# script to set up services
92 84 ###
93   -
94 85 RUN echo "cd $HOMEPATH/$SERVER/$GIT/" >> /usr/bin/docker-entrypoint.sh
95 86 RUN echo "git pull" >> /usr/bin/docker-entrypoint.sh
96 87  
97   -# ajout au script pour maintenir docker up
  88 +# add to the script to maintain docker up
98 89 RUN echo "tail -f /dev/null" >> /usr/bin/docker-entrypoint.sh
99 90  
100 91  
... ...