From 7b208af6829c1f90a1b226114f89b22c8af29009 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Tue, 3 Dec 2024 21:29:23 +0000 Subject: [PATCH 1/2] fix: revert dockerfile for further discussion --- Dockerfile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68168cc..50fc21c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,3 @@ -FROM eclipse-temurin:11-alpine AS base +FROM images.opencadc.org/library/cadc-tomcat:1 -FROM base AS builder - -COPY . /storage-ui -WORKDIR /storage-ui -RUN apk --no-cache add git \ - && git fetch origin main \ - && ./gradlew -i clean spotlessCheck build test --no-daemon - -FROM images.opencadc.org/library/cadc-tomcat:1.3 AS production - -RUN mkdir -p /usr/share/tomcat/config - -COPY --from=builder /storage-ui/build/libs/storage.war /usr/share/tomcat/webapps/ +COPY build/libs/storage.war /usr/share/tomcat/webapps/ From ec1143582010992e15dd6ee9a8975185baa54bb7 Mon Sep 17 00:00:00 2001 From: Dustin Jenkins Date: Tue, 3 Dec 2024 21:35:13 +0000 Subject: [PATCH 2/2] fix: removed build from docker ignore --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 369db8f..1911493 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,5 @@ Dockerfile* bin -build .idea .vscode .gradle