Skip to content

Commit

Permalink
Merge pull request #339 from cescoffier/features/update-docker-base-i…
Browse files Browse the repository at this point in the history
…mage

Update docker base image
  • Loading branch information
stuartwdouglas authored Dec 18, 2018
2 parents b937afd + 9bf898e commit 8e634fc
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion docker/strict-example/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM centos:latest
FROM registry.fedoraproject.org/fedora-minimal
WORKDIR /work
COPY target/shamrock-strict-example-1.0.0.Alpha1-SNAPSHOT-runner /work/shamrock-strict-example-runner
RUN chmod 777 /work
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/building-native-image-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ Create the following `Dockerfile` in the `src/main/docker` (or wherever you want

[source]
----
FROM centos:7
FROM registry.fedoraproject.org/fedora-minimal
WORKDIR /work/
COPY target/*-runner /work/application
RUN chmod 775 /work
Expand Down
9 changes: 9 additions & 0 deletions docs/src/main/asciidoc/ide-configuration.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,15 @@ mvn compile shamrock:dev
You can then update the application sources, resources and configurations.
The changes are automatically reflected in your running application.

== Debugging

You can run a Shamrock application in debug mode using:

[source]
mvn compile shamrock:dev -Ddebug=true

Then, attach your debugger to `localhost:5005`.

== Import in your IDE

Once you have a <<project-creation, project generated>>, you can import it in your favorite IDE.
Expand Down
2 changes: 1 addition & 1 deletion maven/src/main/templates/templates/dockerfile.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# docker run -i --rm -p 8080:8080 shamrock/${mProjectArtifactId}
#
###
FROM centos:7
FROM registry.fedoraproject.org/fedora-minimal
WORKDIR /work/
COPY target/*-runner /work/application
RUN chmod 775 /work
Expand Down

0 comments on commit 8e634fc

Please sign in to comment.