modernizing the thredds radar server

.org/vms/thredds-aws/readme.org

@@ -44,7 +44,7 @@ We will be making heavy use of the ~Unidata/science-gateway~ git repository.
 From the =~/science-gateway/vms/thredds-aws= directory:
 
 #+BEGIN_SRC shell :tangle no :exports code
-  docker build -t unidata/nexrad-tds-docker:latest .
+  docker build -t unidata/thredds-docker:<5-version> .
 #+END_SRC
 
 ** Start TDS With Docker and docker-compose
@@ -102,31 +102,6 @@ You will need Apache Tomcat and TDS log directories:
    mkdir -p /logs/tds/
  #+END_SRC
 
-** S3Objects Directory
-   :PROPERTIES:
-   :CUSTOM_ID: h-F6EBEBDF
-   :END:
-
-*** Create S3Objects Directory
-    :PROPERTIES:
-    :CUSTOM_ID: h-763C22DA
-    :END:
-
-Files served out of S3 are first written to local file system, then served via THREDDS.
-
- #+BEGIN_SRC shell :tangle ../../../vms/thredds-aws/thredds-aws-install.sh
-   mkdir -p ~/S3Objects
- #+END_SRC
-
-*** Scour S3Objects Directory
-    :PROPERTIES:
-    :CUSTOM_ID: h-483C35F9
-    :END:
-
-#+BEGIN_SRC shell :tangle ../../../vms/thredds-aws/thredds-aws-install.sh
-  (crontab -l ; echo "*/5 * * * * find ~/S3Objects -mindepth 1 -mmin +15 -delete")| crontab -
-#+END_SRC
-
 ** SSL Certificate
    :PROPERTIES:
    :CUSTOM_ID: h-0B00E7AE

vms/thredds-aws/docker-compose.yml

@@ -5,7 +5,7 @@ version: '3'
 
 services:
   thredds-production:
-    image: unidata/nexrad-tds-docker:4.6.20
+    image: unidata/thredds-docker:<5-version>
     container_name: thredds
     # restart: always
     ports:
@@ -23,9 +23,9 @@ services:
       # HTTPS
       - ./files/keystore.jks:/usr/local/tomcat/conf/keystore.jks
       - ./files/server.xml:/usr/local/tomcat/conf/server.xml
+      - ./files/web.xml:/usr/local/tomcat/conf/web.xml
       # AWS TDS Nexrad server
       - ~/tdsconfig/:/usr/local/tomcat/content/thredds/
-      - ~/S3Objects/:/usr/local/tomcat/temp/S3Objects/
       - ~/files/credentials:/usr/local/tomcat/.aws/credentials
     env_file:
       - "compose${THREDDS_COMPOSE_ENV_LOCAL}.env"

vms/thredds-aws/readme.md

@@ -7,9 +7,6 @@
     - [Supply Contact and Host Information in threddsConfig.xml](#h-615B0684)
   - [TDS log Directories](#h-F52D01A2)
     - [Create log Directories](#h-99E9AD76)
-  - [S3Objects Directory](#h-F6EBEBDF)
-    - [Create S3Objects Directory](#h-763C22DA)
-    - [Scour S3Objects Directory](#h-483C35F9)
   - [SSL Certificate](#h-0B00E7AE)
   - [Ports 80, 443 and 8443](#h-1541998B)
   - [docker-compose.yml](#h-B1EEBC0A)
@@ -49,7 +46,7 @@ git clone https://github.com/Unidata/science-gateway ~/science-gateway
 From the `~/science-gateway/vms/thredds-aws` directory:
 
 ```shell
-docker build -t unidata/nexrad-tds-docker:latest .
+docker build -t unidata/thredds-docker:<version> .
 ```
 
 
@@ -109,31 +106,6 @@ mkdir -p /logs/tds/
 ```
 
 
-<a id="h-F6EBEBDF"></a>
-
-## S3Objects Directory
-
-
-<a id="h-763C22DA"></a>
-
-### Create S3Objects Directory
-
-Files served out of S3 are first written to local file system, then served via THREDDS.
-
-```shell
-mkdir -p ~/S3Objects
-```
-
-
-<a id="h-483C35F9"></a>
-
-### Scour S3Objects Directory
-
-```shell
-(crontab -l ; echo "*/5 * * * * find ~/S3Objects -mindepth 1 -mmin +15 -delete")| crontab -
-```
-
-
 <a id="h-0B00E7AE"></a>
 
 ## SSL Certificate
@@ -169,9 +141,9 @@ version: '3'
 
 services:
   thredds-production:
-    image: unidata/nexrad-tds-docker:latest
+    image: unidata/thredds-docker:5.5-SNAPSHOT
     container_name: thredds
-    # restart: always
+    restart: always
     ports:
       - "80:8080"
       - "443:8443"
@@ -187,9 +159,9 @@ services:
       # HTTPS
       - ./files/keystore.jks:/usr/local/tomcat/conf/keystore.jks
       - ./files/server.xml:/usr/local/tomcat/conf/server.xml
+      - ./files/web.xml:/usr/local/tomcat/conf/web.xml
       # AWS TDS Nexrad server
       - ~/tdsconfig/:/usr/local/tomcat/content/thredds/
-      - ~/S3Objects/:/usr/local/tomcat/temp/S3Objects/
       - ~/files/credentials:/usr/local/tomcat/.aws/credentials
     env_file:
       - "compose${THREDDS_COMPOSE_ENV_LOCAL}.env"