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.

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

DSS 6.0 migration #35

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 10 additions & 24 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,13 @@
FROM maven:3.9.1-eclipse-temurin-11 as build
# First stage: build the application with maven
FROM maven:3.9.7-eclipse-temurin-21 AS build
COPY . /app
WORKDIR /app
RUN mvn clean install -P quick

COPY pom.xml /usr/src/mymaven/
COPY dss-demo-bundle/pom.xml /usr/src/mymaven/dss-demo-bundle/
# COPY dss-demo-bundle/src /usr/src/mymaven/dss-demo-bundle/src
# Second stage: create and run JAVA app
FROM eclipse-temurin:21

COPY dss-mock-tsa/pom.xml /usr/src/mymaven/dss-mock-tsa/
COPY dss-mock-tsa/src /usr/src/mymaven/dss-mock-tsa/src
ADD 'https://dtdg.co/latest-java-tracer' /dd-java-agent.jar

COPY dss-demo-webapp/pom.xml /usr/src/mymaven/dss-demo-webapp/
COPY dss-demo-webapp/src /usr/src/mymaven/dss-demo-webapp/src

WORKDIR /usr/src/mymaven

RUN mvn clean package -pl dss-mock-tsa,dss-demo-webapp -P quick


FROM tomcat:9

RUN apt-get update && apt-get upgrade -y

RUN wget -O dd-java-agent.jar https://dtdg.co/latest-java-tracer
COPY setenv.sh /usr/local/tomcat/bin

COPY --from=build /usr/src/mymaven/dss-demo-webapp/target/dss-demo-webapp-*.war /usr/local/tomcat/webapps/ROOT.war

EXPOSE 8080
COPY --from=build /app/target/*.jar /app.jar
ENTRYPOINT java -javaagent:/dd-java-agent.jar -jar /app.jar
109 changes: 0 additions & 109 deletions dss-demo-bundle/pom.xml

This file was deleted.

53 changes: 0 additions & 53 deletions dss-demo-bundle/src/main/assembly/assembly.xml

This file was deleted.

2 changes: 0 additions & 2 deletions dss-demo-bundle/src/main/resources/root/DSS-Web.URL

This file was deleted.

6 changes: 0 additions & 6 deletions dss-demo-bundle/src/main/resources/root/Webapp-Shutdown.bat

This file was deleted.

6 changes: 0 additions & 6 deletions dss-demo-bundle/src/main/resources/root/Webapp-Startup.bat

This file was deleted.

Loading
Loading