##// END OF EJS Templates
Update config files
jespinoza -
r4:e8469ab3bca7
parent child
Show More
@@ -0,0 +1,3
1 MADROOT=/madrigal
2 EXP_DIR=/usr/local/experiments
3 MAD_PORT=8080
@@ -1,22 +1,25
1 # general
1 # general
2 .env
2 .env
3 .DS_store
3 .DS_store
4 *.pyc
4 *.pyc
5 *.sqlite
5 *.sqlite
6 # config
6 # config
7 madrigal.cfg
7 madrigal.cfg
8 # metadata
8 # metadata
9 siteTab.txt
9 siteTab.txt
10 expTab.txt
10 expTab.txt
11 expTabAll.txt
11 expTabAll.txt
12 fileTab.txt
12 fileTab.txt
13 fileTabAll.txt
13 fileTabAll.txt
14 instData.txt
14 instData.txt
15 instDataPriv.txt
15 instDataPriv.txt
16 instParmLastUpdate.txt
16 instParmLastUpdate.txt
17 instTab.txt
17 instTab.txt
18 instType.txt
18 instType.txt
19 siteTab.txt
19 siteTab.txt
20 typeTab.txt
20 typeTab.txt
21 instKindatTab.txt
22 instParmTab.txt
23 parmCodes.txt
21 # experiments
24 # experiments
22 experiments/
25 experiments/
@@ -1,16 +1,17
1 FROM python:3.7-slim
1 FROM python:3.7-slim
2
2
3 RUN mkdir /madrigal
3 RUN mkdir /madrigal
4
4
5 WORKDIR /madrigal
5 WORKDIR /madrigal
6
6
7 ADD required_modules.txt ./required_modules.txt
7 ADD required_modules.txt ./required_modules.txt
8
8
9 RUN apt clean && apt update && apt install -y --no-install-recommends \
9 RUN apt clean && apt update && apt install -y --no-install-recommends \
10 gcc gfortran build-essential automake autotools-dev autoconf m4 libtool hdf5-tools\
10 gcc gfortran build-essential automake autotools-dev autoconf m4 libtool hdf5-tools\
11 && rm -rf /var/lib/apt/lists/*\
11 && rm -rf /var/lib/apt/lists/*\
12 && pip install -r required_modules.txt && pip install django-bootstrap3
12 && pip install -r required_modules.txt && pip install django-bootstrap3
13
13
14 COPY . ./
14 COPY . ./
15
15
16 RUN ln -s /usr/local/bin/python3.7 /madrigal/bin/python && bash installMadrigal
16 RUN ln -s /usr/local/bin/python3.7 /madrigal/bin/python && bash installMadrigal
17
@@ -1,29 +1,31
1 version: '3'
1 version: '3'
2
2
3 services:
3 services:
4 web:
4 web:
5 container_name: 'madrigal'
5 container_name: 'madrigal'
6 build: .
6 build: .
7 restart: always
7 restart: always
8 image: madrigal
8 image: madrigal
9 working_dir: /madrigal/source/madpy/djangoMad
9 working_dir: /madrigal/source/madpy/djangoMad
10 command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
10 command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
11 # command: python manage.py runserver 0.0.0.0:8000
11 # command: python manage.py runserver 0.0.0.0:8000
12 env_file: .env
12 env_file: .env
13 # ports:
13 # ports:
14 # - 8080:8080
14 # - 8080:8080
15 volumes:
15 volumes:
16 - './:/madrigal'
16 - '${EXP_DIR}:/madrigal/experiments'
17 - '/usr/local/madrigal/metadata:/madrigal/metadata'
18 - '/usr/local/madrigal/source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
17
19
18 nginx:
20 nginx:
19 container_name: 'madrigal-nginx'
21 container_name: 'madrigal-nginx'
20 image: nginx:1.15-alpine
22 image: nginx:1.15-alpine
21 volumes:
23 volumes:
22 - ./source/madpy/djangoMad/madweb/static:/static
24 - ./source/madpy/djangoMad/madweb/static:/static
23 - ./nginx:/etc/nginx/conf.d
25 - ./nginx:/etc/nginx/conf.d
24 ports:
26 ports:
25 - "8080:8080"
27 - "${MAD_PORT}:8080"
26 depends_on:
28 depends_on:
27 - web
29 - web
28 command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
30 command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
29
31
General Comments 0
You need to be logged in to leave comments. Login now