Merge pull request #23 from at88mph/image-rework

Dockerfile rework
opencadc · Dec 3, 2024 · 514e403 · 514e403
2 parents 9bfeda1 + ec11435
commit 514e403
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,6 +1,5 @@
 Dockerfile*
 bin
-build
 .idea
 .vscode
 .gradle

diff --git 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/
-Original file line number
+Diff line change
@@ -1,6 +1,5 @@
     Dockerfile*
     bin
-    build
     .idea
     .vscode
     .gradle
@@ Expand Down @@