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

Update dockerfile for adservice to use different base images #705

Merged
merged 7 commits into from
Jan 24, 2023
Merged

Update dockerfile for adservice to use different base images #705

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d2f8ff8
Update dockerfile for adservice to use different base images
svrnm Jan 20, 2023
5ddde51
Merge branch 'main' into update-adservice-docker-files
svrnm Jan 20, 2023
5f4e0e6
Update CHANGELOG.md
svrnm Jan 20, 2023
20c0d60
Merge branch 'main' into update-adservice-docker-files
cartersocha Jan 22, 2023
8d1ddd7
Merge branch 'main' into update-adservice-docker-files
svrnm Jan 22, 2023
8185788
Revert use of gradle docker image
svrnm Jan 24, 2023
c1d5a91
Merge branch 'main' into update-adservice-docker-files
svrnm Jan 24, 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 @@ -202,3 +202,5 @@ significant modifications will be credited to OpenTelemetry Authors.
([#700](https://github.com/open-telemetry/opentelemetry-demo/pull/700))
* Reduce spans generated from quote service
([#702](https://github.com/open-telemetry/opentelemetry-demo/pull/702))
* Update dockerfile for adservice to use different base images
([#705](https://github.com/open-telemetry/opentelemetry-demo/pull/705))
14 changes: 7 additions & 7 deletions src/adservice/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,26 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM eclipse-temurin:17-jdk AS builder
FROM gradle:7-jdk17 AS builder
svrnm marked this conversation as resolved.
Show resolved Hide resolved

WORKDIR /usr/src/app/

COPY ./src/adservice/ ./
COPY ./pb/ ./proto
RUN ./gradlew downloadRepos
RUN ./gradlew installDist -PprotoSourceDir=./proto
RUN gradle downloadRepos
RUN gradle installDist -PprotoSourceDir=./proto

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

FROM eclipse-temurin:17-jdk
FROM eclipse-temurin:17-jre

ARG version=1.19.1
WORKDIR /usr/src/app/

COPY --from=builder /usr/src/app/ ./
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
ENV JAVA_TOOL_OPTIONS=-javaagent:/app/opentelemetry-javaagent.jar
ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /usr/src/app/opentelemetry-javaagent.jar
RUN chmod 644 /usr/src/app/opentelemetry-javaagent.jar
ENV JAVA_TOOL_OPTIONS=-javaagent:/usr/src/app/opentelemetry-javaagent.jar

EXPOSE ${AD_SERVICE_PORT}
ENTRYPOINT [ "./build/install/hipstershop/bin/AdService" ]