From 959ef900a21478161dd50a93865cafceae40dbaf Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Mon, 29 Apr 2024 08:03:59 -0700 Subject: [PATCH] Update Dockerfiles for latest. --- cone/Dockerfile | 20 ++++++++------------ cone/build.gradle | 6 +++--- data/Dockerfile | 23 +++++++++++------------ datalink/Dockerfile | 22 ++++++++++------------ reg/Dockerfile | 20 ++++++++------------ sia/Dockerfile | 20 ++++++++------------ soda/Dockerfile | 19 ++++++++----------- tap/Dockerfile | 22 +++++++++++----------- 8 files changed, 67 insertions(+), 85 deletions(-) diff --git a/cone/Dockerfile b/cone/Dockerfile index 7ab0141..871a797 100644 --- a/cone/Dockerfile +++ b/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/ diff --git a/cone/build.gradle b/cone/build.gradle index d887b21..a59bab2 100644 --- a/cone/build.gradle +++ b/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)' diff --git a/data/Dockerfile b/data/Dockerfile index 9fe59fe..9bc27e2 100644 --- a/data/Dockerfile +++ b/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| \ |' \ conf/server.xml +RUN rm -rf webapps/* + COPY build/libs/*.war webapps/ diff --git a/datalink/Dockerfile b/datalink/Dockerfile index ccb0970..871a797 100644 --- a/datalink/Dockerfile +++ b/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| \ |' \ conf/server.xml -COPY *.properties config/ +RUN rm -rf webapps/* + COPY build/libs/*.war webapps/ diff --git a/reg/Dockerfile b/reg/Dockerfile index 7ab0141..871a797 100644 --- a/reg/Dockerfile +++ b/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/ diff --git a/sia/Dockerfile b/sia/Dockerfile index 7ab0141..871a797 100644 --- a/sia/Dockerfile +++ b/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/ diff --git a/soda/Dockerfile b/soda/Dockerfile index fa5f6e3..871a797 100644 --- a/soda/Dockerfile +++ b/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 diff --git a/tap/Dockerfile b/tap/Dockerfile index fa5f6e3..c954b87 100644 --- a/tap/Dockerfile +++ b/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