From 2e29893b10f5f2d34d45f6aa7a7077173cca1ff8 2021-09-14 16:13:03
From: Juan C. Espinoza <jespinoza@igp.gob.pe>
Date: 2021-09-14 16:13:03
Subject: [PATCH] Update configs

---

diff --git a/.gitignore b/.gitignore
index baac98b..7b74944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,5 @@ typeTab.txt
 instKindatTab.txt
 instParmTab.txt
 parmCodes.txt
-# experiments
 experiments/
+static_files/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 760205d..3f54c53 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /madrigal
 ADD required_modules.txt ./required_modules.txt
 
 RUN apt clean && apt update && apt install -y --no-install-recommends \
-	gcc gfortran build-essential automake autotools-dev autoconf m4 libtool hdf5-tools\
+	gcc gfortran build-essential automake autotools-dev autoconf m4 libtool hdf5-tools libhdf5-dev libnetcdf-dev pkg-config\
 	&& rm -rf /var/lib/apt/lists/*\
     && pip install -r required_modules.txt && pip install django-bootstrap3
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 3b537fe..683d233 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,20 +8,16 @@ services:
     image: madrigal
     working_dir: /madrigal/source/madpy/djangoMad
     command: gunicorn djangoMad.wsgi --bind 0.0.0.0:8000
-    # command: python manage.py runserver 0.0.0.0:8888
     env_file: .env
-    # ports:
-    #   - 8888:8888
     volumes:
       - '${EXP_DIR}:/madrigal/experiments'
-      # - '/usr/local/madrigal/metadata:/madrigal/metadata'
-      - '/home/jespinoza/workspace/madrigal/source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
+      - './source/madpy/djangoMad:/madrigal/source/madpy/djangoMad'
     
   nginx:
     container_name: 'madrigal-nginx'
     image: nginx:1.15-alpine
     volumes:
-        - ./source/madpy/djangoMad/madweb/static:/static
+        - ./source/madpy/djangoMad/static_files:/static
         - ./nginx:/etc/nginx/conf.d
     ports:
         - "${MAD_PORT}:8080"
diff --git a/installMadrigal b/installMadrigal
index d941520..c98348d 100644
--- a/installMadrigal
+++ b/installMadrigal
@@ -151,7 +151,7 @@ then
 fi
 
 echo "********** ./configure **********"
-./configure --prefix=$MADROOT
+./configure --prefix=$MADROOT FFLAGS=-std=legacy
 if [ $? -ne 0 ]
 then
     exit -1
diff --git a/source/madpy/djangoMad/djangoMad/settings.py b/source/madpy/djangoMad/djangoMad/settings.py
index 2762f09..6555a43 100644
--- a/source/madpy/djangoMad/djangoMad/settings.py
+++ b/source/madpy/djangoMad/djangoMad/settings.py
@@ -130,6 +130,7 @@ MEDIA_URL = '/media/'
 # URL prefix for static files.
 # Example: "http://media.lawrence.com/static/"
 STATIC_URL = '/madrigal/static/'
+STATIC_ROOT = '/madrigal/source/madpy/djangoMad/static_files/'
 
 BOOTSTRAP3 = {
     # Include jQuery with Bootstrap JavaScript (affects django-bootstrap3 template tags)