##// END OF EJS Templates
Update configs
jespinoza -
r9:2e29893b10f5
parent child
Show More
@@ -21,5 +21,5 typeTab.txt
21 21 instKindatTab.txt
22 22 instParmTab.txt
23 23 parmCodes.txt
24 # experiments
25 24 experiments/
25 static_files/ No newline at end of file
@@ -7,7 +7,7 WORKDIR /madrigal
7 7 ADD required_modules.txt ./required_modules.txt
8 8
9 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 libhdf5-dev libnetcdf-dev pkg-config\
11 11 && rm -rf /var/lib/apt/lists/*\
12 12 && pip install -r required_modules.txt && pip install django-bootstrap3
13 13
@@ -8,20 +8,16 services:
8 8 image: madrigal
9 9 working_dir: /madrigal/source/madpy/djangoMad
10 10 command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
11 # command: python manage.py runserver 0.0.0.0:8888
12 11 env_file: .env
13 # ports:
14 # - 8888:8888
15 12 volumes:
16 13 - '${EXP_DIR}:/madrigal/experiments'
17 # - '/usr/local/madrigal/metadata:/madrigal/metadata'
18 - '/home/jespinoza/workspace/madrigal/source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
14 - './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
19 15
20 16 nginx:
21 17 container_name: 'madrigal-nginx'
22 18 image: nginx:1.15-alpine
23 19 volumes:
24 - ./source/madpy/djangoMad/madweb/static:/static
20 - ./source/madpy/djangoMad/static_files:/static
25 21 - ./nginx:/etc/nginx/conf.d
26 22 ports:
27 23 - "${MAD_PORT}:8080"
@@ -151,7 +151,7 then
151 151 fi
152 152
153 153 echo "********** ./configure **********"
154 ./configure --prefix=$MADROOT
154 ./configure --prefix=$MADROOT FFLAGS=-std=legacy
155 155 if [ $? -ne 0 ]
156 156 then
157 157 exit -1
@@ -130,6 +130,7 MEDIA_URL = '/media/'
130 130 # URL prefix for static files.
131 131 # Example: "http://media.lawrence.com/static/"
132 132 STATIC_URL = '/madrigal/static/'
133 STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
133 134
134 135 BOOTSTRAP3 = {
135 136 # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
General Comments 0
You need to be logged in to leave comments. Login now