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

Use different base images for frauddetectionservice #691

Merged
merged 7 commits into from
Jan 18, 2023
Merged

Use different base images for frauddetectionservice #691

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6acb02a
Use different docker base images for frauddetection service
svrnm Jan 17, 2023
d7f2ea5
Add entry in CHANGELOG
svrnm Jan 17, 2023
dd2eea4
update changelog
svrnm Jan 17, 2023
ca2fd55
Merge branch 'main' into use-different-base-images-for-frauddetection…
svrnm Jan 17, 2023
014e5cf
Merge branch 'main' into use-different-base-images-for-frauddetection…
svrnm Jan 18, 2023
cf13f9d
Remove extra blank line
julianocosta89 Jan 18, 2023
afcc44c
Merge branch 'main' into use-different-base-images-for-frauddetection…
cartersocha Jan 18, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#688](https://github.com/open-telemetry/opentelemetry-demo/pull/688))
* Update docker-compose services to restart unless stopped
([#690](https://github.com/open-telemetry/opentelemetry-demo/pull/690))
* Use different docker base images for frauddetection service
([#691](https://github.com/open-telemetry/opentelemetry-demo/pull/691))
1 change: 1 addition & 0 deletions src/frauddetectionservice/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dockerfile
11 changes: 5 additions & 6 deletions src/frauddetectionservice/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
FROM eclipse-temurin:17 AS builder
FROM gradle:7-jdk17 AS builder

WORKDIR /usr/src/app/

COPY ./src/frauddetectionservice/ ./
COPY ./pb/ ./src/main/proto/
RUN chmod +x ./gradlew
RUN ./gradlew shadowJar
RUN gradle shadowJar

# -----------------------------------------------------------------------------

FROM eclipse-temurin:17
FROM gcr.io/distroless/java17-debian11

ARG version=1.16.0
ARG version=1.22.1
WORKDIR /usr/src/app/

COPY --from=builder /usr/src/app/build/libs/frauddetectionservice-1.0-all.jar ./
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /app/opentelemetry-javaagent.jar
RUN chmod 644 /app/opentelemetry-javaagent.jar
# RUN chmod 644 /app/opentelemetry-javaagent.jar
ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar

ENTRYPOINT [ "java", "-jar", "frauddetectionservice-1.0-all.jar" ]