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

Fix uses of jlink-image directories to use new "-jri" suffix. #2469

Merged
merged 3 commits into from
Oct 21, 2020
Merged

Fix uses of jlink-image directories to use new "-jri" suffix. #2469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6553ce5
Fix uses of jlink-image directories to use new "-jri" suffix.
batsatt Oct 20, 2020
3fad09f
Fix quickstart archetype readmes.
batsatt Oct 21, 2020
ba969f7
Fix quickstart archetype readmes.
batsatt Oct 21, 2020
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
8 changes: 4 additions & 4 deletions docs/common/guides/jlink_image.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ This uses the `helidon-maven-plugin` to perform the custom image generation.
After the build completes it will report some statistics about the build including
the reduction in image size.

The `target/helidon-quickstart-{helidon-lc-flavor}` directory is a self contained
The `target/helidon-quickstart-{helidon-lc-flavor}-jri` directory is a self contained
custom image of your application. It contains your application, its runtime
dependencies and the JDK modules it depends on. You can start your application
using the provide
`start` script:

[source,bash,subs="attributes+"]
----
./target/helidon-quickstart-{helidon-lc-flavor}/bin/start
./target/helidon-quickstart-{helidon-lc-flavor}-jri/bin/start
----

=== Class Data Sharing (CDS) Archive
Expand Down Expand Up @@ -147,7 +147,7 @@ Dockerfile included with the quickstart.

[source,bash,subs="attributes+"]
----
docker build -t helidon-quickstart-{helidon-lc-flavor}-jlink -f Dockerfile.jlink .
docker build -t helidon-quickstart-{helidon-lc-flavor}-jri -f Dockerfile.jlink .
----

[TIP]
Expand All @@ -162,7 +162,7 @@ Start the application:

[source,bash,subs="attributes+"]
----
docker run --rm -p 8080:8080 helidon-quickstart-{helidon-lc-flavor}-jlink:latest
docker run --rm -p 8080:8080 helidon-quickstart-{helidon-lc-flavor}-jri:latest
----

You can exercise the application's endpoints as before.
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstarts/helidon-quickstart-mp/Dockerfile.jlink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ RUN echo "done!"

FROM debian:stretch-slim
WORKDIR /helidon
COPY --from=build /helidon/target/helidon-quickstart-mp ./
COPY --from=build /helidon/target/helidon-quickstart-mp-jri ./
ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
EXPOSE 8080
2 changes: 1 addition & 1 deletion examples/quickstarts/helidon-quickstart-se/Dockerfile.jlink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ RUN echo "done!"

FROM debian:stretch-slim
WORKDIR /helidon
COPY --from=build /helidon/target/helidon-quickstart-se ./
COPY --from=build /helidon/target/helidon-quickstart-se-jri ./
ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
EXPOSE 8080
2 changes: 1 addition & 1 deletion examples/quickstarts/helidon-standalone-quickstart-mp/Dockerfile.jlink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ RUN echo "done!"

FROM debian:stretch-slim
WORKDIR /helidon
COPY --from=build /helidon/target/helidon-quickstart-mp ./
COPY --from=build /helidon/target/helidon-quickstart-mp-jri ./
ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
EXPOSE 8080
2 changes: 1 addition & 1 deletion examples/quickstarts/helidon-standalone-quickstart-se/Dockerfile.jlink
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@ RUN echo "done!"

FROM debian:stretch-slim
WORKDIR /helidon
COPY --from=build /helidon/target/helidon-quickstart-se ./
COPY --from=build /helidon/target/helidon-quickstart-se-jri ./
ENTRYPOINT ["/bin/bash", "/helidon/bin/start"]
EXPOSE 8080