dune vs imars-dockerhost-dune

I think I may have accidentally created two branches. dune appears to be the latest but it is not running directly on dune's hardware. It is being used in a docker container and thus functions identically to imars-dockerhost-dune. Here is a diff:

[root@dune erddap-config]# git diff imars-dockerhost-dune
diff --git a/docker-compose.yml b/docker-compose.yml
index c201683..8dd4a56 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,9 +2,15 @@
 version: '3.3'

 services:
-  # docker run -d -p 8080:8080 --name erddap axiom/docker-erddap
+  # docker run -d -p 8080:8080 --name erddap axiom/docker-erddap -e ERDDAP_MEMORY=64G --volumes ...
   erddap:
     container_name: erddap
+    restart: unless-stopped
+    ports:
+      - 8080:8080
+    environment:
+      - ERDDAP_MEMORY=64G  # default is 4G
+    image: axiom/docker-erddap
     volumes:
       #- ./erddap/erddap_data:/erddapData
       # erddap content incl. setup.xml & dataset.xml :
@@ -16,7 +22,6 @@ services:
       - '/srv/imars-objects/gom/chlor_a_l3_pass:/srv/imars-objects/gom/chlor_a_l3_pass'
       - '/srv/imars-objects/mbon/data_big:/srv/imars-objects/mbon/data_big'
       - '/srv/imars-objects/gom/sst_avhrr_1km:/srv/imars-objects/gom/sst_avhrr_1km'
-      - 'gom:/gom_vol'  # TODO: this not working
       - '/srv/imars-objects/modis_aqua_fgbnms:/srv/imars-objects/modis_aqua_fgbnms'
       - '/srv/imars-objects/fgb:/srv/imars-objects/fgb'
       - '/srv/imars-objects/modis_aqua_fk:/srv/imars-objects/modis_aqua_fk'
@@ -28,8 +33,3 @@ services:
       - '/srv/imars-objects/fk/MEAN_7D_VSNPP/OC:/srv/imars-objects/fk/MEAN_7D_VSNPP/OC'
       - '/srv/imars-objects/fk/MEAN_7D_VSNPP/SST:/srv/imars-objects/fk/MEAN_7D_VSNPP/SST'
       - '/srv/imars-objects/fk/MEAN_7D_VSNPP/SSTN:/srv/imars-objects/fk/MEAN_7D_VSNPP/SSTN'
-    restart: unless-stopped
-    ports:
-      - 8080:8080
- # sudo docker exec -it erddap bash -c "cd /usr/local/tomcat/webapps/erddap/WEB-INF && bash GenerateDatasetsXml.sh -verbose"
-
diff --git a/setup.xml b/setup.xml
index 92cda51..57a5c08 100644
--- a/setup.xml
+++ b/setup.xml
@@ -31,7 +31,7 @@ For ERD releases, we use
 If you want to encourage all users to use https (not http),
   make the baseUrl the same as the baseHttpsUrl (see below).
 -->
-<baseUrl>http://http://131.247.136.200:8080</baseUrl>
+<baseUrl>http://131.247.136.200:8080</baseUrl>

looking at this I would suggest keeping the dune branch and ignoring the imars-dockerhost-dune one.

USF-IMARS / erddap-config

dune vs imars-dockerhost-dune #17