Update Dockerfiles for latest.

cone/Dockerfile

@@ -1,21 +1,18 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 
@@ -31,5 +28,4 @@ RUN sed -i 's| \
 
 RUN rm -rf webapps/*
 
-COPY docker/*.properties config/
 COPY build/libs/*.war webapps/

cone/build.gradle

@@ -21,9 +21,9 @@ dependencies {
 
     // This dependency is used by the application.
     implementation 'org.opencadc:cadc-conesearch:[1.0.0,1.1.0)'
-    implementation 'org.opencadc:cadc-dali:[1.2.18,2.0)'
-    implementation 'org.opencadc:cadc-log:[1.1.7,1.2.0)'
-    implementation 'org.opencadc:cadc-rest:[1.3.12,1.4.0)'
+    implementation 'org.opencadc:cadc-dali:[1.2.17,2.0)'
+    implementation 'org.opencadc:cadc-log:[1.2.1,1.3.0)'
+    implementation 'org.opencadc:cadc-rest:[1.3.20,1.4.0)'
     implementation 'org.opencadc:cadc-uws-server:[1.2.14,1.3.0)'
     implementation 'org.opencadc:cadc-vosi:[1.3.4,2.0)'
 

data/Dockerfile

@@ -1,7 +1,7 @@
 FROM tomcat:9-jdk17 as build
 
 RUN apt-get update \
-    && apt-get install -y bzip2 curl gcc make sudo
+    && apt-get install --no-install-recommends -y bzip2 curl gcc libc-dev libtool make sudo
 
 ADD "https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/wcslib/5.15-1/wcslib_5.15.orig.tar.bz2" "/tmp/wcslib.tar.bz2"
 
@@ -23,22 +23,19 @@ COPY --from=build /usr/lib/libwcs.so /usr/lib/
 COPY --from=build /usr/lib/libwcs.so.5 /usr/lib/
 COPY --from=build /usr/lib/libwcs.so.5.15 /usr/lib/
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 
@@ -52,4 +49,6 @@ RUN sed -i 's| \
      </Host>|' \
   conf/server.xml
 
+RUN rm -rf webapps/*
+
 COPY build/libs/*.war webapps/

datalink/Dockerfile

@@ -1,21 +1,18 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 
@@ -29,5 +26,6 @@ RUN sed -i 's| \
      </Host>|' \
   conf/server.xml
 
-COPY *.properties config/
+RUN rm -rf webapps/*
+
 COPY build/libs/*.war webapps/

reg/Dockerfile

@@ -1,21 +1,18 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 
@@ -31,5 +28,4 @@ RUN sed -i 's| \
 
 RUN rm -rf webapps/*
 
-COPY docker/*.properties config/
 COPY build/libs/*.war webapps/

sia/Dockerfile

@@ -1,21 +1,18 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 
@@ -31,5 +28,4 @@ RUN sed -i 's| \
 
 RUN rm -rf webapps/*
 
-COPY docker/*.properties config/
 COPY build/libs/*.war webapps/

soda/Dockerfile

@@ -1,21 +1,18 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat
 

tap/Dockerfile

@@ -1,21 +1,21 @@
 FROM tomcat:9-jdk17
 
-# Create tomcat user:group with known uid:gid
-RUN groupadd --gid 8675309 tomcat \
-    && useradd --uid 8675309 --home-dir /usr/local/tomcat --shell /sbin/nologin \
-        --no-create-home --no-user-group --no-log-init tomcat
+# Allow it to be set at build time.
+ARG TOMCAT_USER=tomcat
+
+# Create tomcat user:group
+RUN groupadd ${TOMCAT_USER} \
+    && useradd --home-dir /usr/local/tomcat --shell /sbin/nologin \
+        --no-create-home --no-user-group --no-log-init ${TOMCAT_USER}
+
+# Add the Oracle JDBC driver here.
+ADD https://download.oracle.com/otn-pub/otn_software/jdbc/1922/ojdbc10.jar /usr/local/tomcat/lib/ojdbc10.jar
 
 # Create expected config director for all application config.
 RUN mkdir -p config \
   && chown -R tomcat:tomcat /usr/local/tomcat
 
-RUN apt update \
-    && apt install -y sudo \
-    && echo "tomcat ALL=(root) NOPASSWD:SETENV:/usr/sbin/update-ca-certificates" >> /etc/sudoers.d/tomcat \
-    && apt clean \
-    && rm -rf /var/apt/lists/*
-
-USER tomcat
+USER ${TOMCAT_USER}
 
 WORKDIR /usr/local/tomcat