Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile rework #23

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Dockerfile rework #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b208af
fix: revert dockerfile for further discussion
at88mph Dec 3, 2024
ec11435
fix: removed build from docker ignore
at88mph Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Dockerfile*
bin
build
.idea
.vscode
.gradle
Expand Down
16 changes: 2 additions & 14 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/
Loading