Please enable JavaScript to use RhodeCode Enterprise
##// END OF EJS Templates
0
.gitignore
+1
-1
@@
-21,5
+21,5
typeTab.txt
21
instKindatTab.txt
21
instKindatTab.txt
22
instParmTab.txt
22
instParmTab.txt
23
parmCodes.txt
23
parmCodes.txt
24
# experiments
25
experiments/
24
experiments/
25
static_files/
No newline at end of file
0
Dockerfile
+1
-1
@@
-7,7
+7,7
WORKDIR /madrigal
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 libhdf5-dev libnetcdf-dev pkg-config \
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
0
docker-compose.yml
+2
-6
@@
-8,20
+8,16
services:
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:8888
12
env_file : .env
11
env_file : .env
13
# ports:
14
# - 8888:8888
15
volumes :
12
volumes :
16
- '${EXP_DIR}:/madrigal/experiments'
13
- '${EXP_DIR}:/madrigal/experiments'
17
# - '/usr/local/madrigal/metadata:/madrigal/metadata'
14
- './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
18
- '/home/jespinoza/workspace/madrigal/source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
19
15
20
nginx :
16
nginx :
21
container_name : 'madrigal-nginx'
17
container_name : 'madrigal-nginx'
22
image : nginx:1.15-alpine
18
image : nginx:1.15-alpine
23
volumes :
19
volumes :
24
- ./source/madpy/djangoMad/madweb/static:/static
20
- ./source/madpy/djangoMad/static_files :/static
25
- ./nginx:/etc/nginx/conf.d
21
- ./nginx:/etc/nginx/conf.d
26
ports :
22
ports :
27
- "${MAD_PORT}:8080"
23
- "${MAD_PORT}:8080"
0
installMadrigal
+1
-1
@@
-151,7
+151,7
then
151
fi
151
fi
152
152
153
echo "********** ./configure **********"
153
echo "********** ./configure **********"
154
./configure --prefix=$MADROOT
154
./configure --prefix=$MADROOT FFLAGS=-std=legacy
155
if [ $? -ne 0 ]
155
if [ $? -ne 0 ]
156
then
156
then
157
exit -1
157
exit -1
0
source/madpy/djangoMad/djangoMad/settings.py
+1
0
@@
-130,6
+130,7
MEDIA_URL = '/media/'
130
# URL prefix for static files.
130
# URL prefix for static files.
131
# Example: "http://media.lawrence.com/static/"
131
# Example: "http://media.lawrence.com/static/"
132
STATIC_URL = '/madrigal/static/'
132
STATIC_URL = '/madrigal/static/'
133
STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
133
134
134
BOOTSTRAP3 = {
135
BOOTSTRAP3 = {
135
# Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
136
# Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)
Site-wide shortcuts
/
Use quick search box
g h
Goto home page
g g
Goto my private gists page
g G
Goto my public gists page
g 0-9
Goto bookmarked items from 0-9
n r
New repository page
n g
New gist page
Repositories
g s
Goto summary page
g c
Goto changelog page
g f
Goto files page
g F
Goto files page with file search activated
g p
Goto pull requests page
g o
Goto repository settings
g O
Goto repository access permissions settings
t s
Toggle sidebar on some pages
