##// END OF EJS Templates
DATABASES » madrigal
RSS
Fix docker commands
jespinoza -
r1:c98dcec9786f
parent child
Show More
Show file before | Show file after | Hide comments
@@ -0,0 +1,21
1 # configuration
2
3 upstream djangomad {
4 server web:8000;
5 }
6
7 server {
8 listen 80;
9
10 location / {
11 proxy_http_version 1.1;
12 proxy_set_header Upgrade $http_upgrade;
13 proxy_set_header Connection "upgrade";
14 proxy_redirect off;
15 proxy_pass http://djangomad;
16 }
17
18 location /static/ {
19 alias /static/;
20 }
21 } No newline at end of file
Show file before | Show file after | Hide comments
@@ -1,5 +1,22
1 # general
1 .env
2 .env
3 .DS_store
4 *.pyc
5 *.sqlite
6 # config
2 madrigal.cfg
7 madrigal.cfg
8 # metadata
3 siteTab.txt
9 siteTab.txt
4 madrigal.sqlite
10 expTab.txt
11 expTabAll.txt
12 fileTab.txt
13 fileTabAll.txt
14 instData.txt
15 instDataPriv.txt
16 instParmLastUpdate.txt
17 instTab.txt
18 instType.txt
19 siteTab.txt
20 typeTab.txt
21 # experiments
5 experiments/
22 experiments/
Show file before | Show file after | Hide comments
@@ -4,13 +4,13 RUN mkdir /madrigal
4
4
5 WORKDIR /madrigal
5 WORKDIR /madrigal
6
6
7 COPY . ./
7 ADD required_modules.txt ./required_modules.txt
8
8
9 RUN apt-get clean && apt-get update && apt-get install -y --no-install-recommends \
9 RUN apt clean && apt update && apt install -y --no-install-recommends \
10 gcc autotools h5utils\
10 gcc gfortran build-essential automake autotools-dev autoconf m4 libtool hdf5-tools\
11 && apt-get purge -y --auto-remove gcc g++\
12 && rm -rf /var/lib/apt/lists/*\
11 && rm -rf /var/lib/apt/lists/*\
13 && ln -s /usr/bin/python /madrigal/bin/python
12 && pip install -r required_modules.txt && pip install django-bootstrap3
14
13
15 RUN bash installMadrigal
14 COPY . ./
16
15
16 RUN ln -s /usr/local/bin/python3.7 /madrigal/bin/python && bash installMadrigal
Show file before | Show file after | Hide comments
@@ -6,19 +6,24 services:
6 build: .
6 build: .
7 restart: always
7 restart: always
8 image: madrigal
8 image: madrigal
9 command: python manage.py runserver 0.0.0.0:8000
9 working_dir: /madrigal/source/madpy/djangoMad
10 command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
11 # command: python manage.py runserver 0.0.0.0:8000
10 env_file: .env
12 env_file: .env
11 ports:
13 # ports:
12 - "8000:8000"
14 # - 8080:8080
13 links:
15 volumes:
14 - redis
16 - './:/madrigal'
15 - mongo
17
18 nginx:
19 container_name: 'madrigal-nginx'
20 image: nginx:1.15-alpine
16 volumes:
21 volumes:
17 - './:${APP_DIR}'
22 - ./source/madpy/djangoMad/madweb/static:/static
23 - ./nginx:/etc/nginx/conf.d
24 ports:
25 - "8080:8080"
18 depends_on:
26 depends_on:
19 - redis
27 - web
20 - mongo
28 command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'"
21
29 No newline at end of file
22
23
24
Show file before | Show file after | Hide comments
@@ -240,6 +240,7 fi
240 # Install Experiments
240 # Install Experiments
241 # -------------------
241 # -------------------
242 echo "********** configureExperiments **********"
242 echo "********** configureExperiments **********"
243 chmod +x configureExperiments
243 ./configureExperiments
244 ./configureExperiments
244 if [ $? -ne 0 ]
245 if [ $? -ne 0 ]
245 then
246 then
@@ -249,6 +250,7 fi
249 # Update metadata
250 # Update metadata
250 # -------------------
251 # -------------------
251 echo "********** Updating metadata tables **********"
252 echo "********** Updating metadata tables **********"
253 chmod +x -R bin/
252 bin/updateMaster
254 bin/updateMaster
253 if [ $? -ne 0 ]
255 if [ $? -ne 0 ]
254 then
256 then
Show file before | Show file after | Hide comments
@@ -8,6 +8,9 netCDF4
8 scipy
8 scipy
9 setuptools
9 setuptools
10 django
10 django
11 bootstrap3
11 # bootstrap3
12 aacgmv2
12 aacgmv2
13 sqlparse
13 sqlparse
14 filelock
15 gunicorn
16 plotly No newline at end of file
General Comments 0
You need to be logged in to leave comments. Login now