Skip to content

Commit

Permalink
Merge pull request #2 from cescoffier/graal-19
Browse files Browse the repository at this point in the history
Update the Docker image
  • Loading branch information
dmlloyd authored Jun 24, 2019
2 parents 493e408 + 0530f42 commit fb966c7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class NativeImagePhase implements AppCreationPhase<NativeImagePhase>, Nat

private String nativeImageXmx;

private String builderImage = "quay.io/quarkus/centos-quarkus-native-image:graalvm-1.0.0-rc16";
private String builderImage = "quay.io/quarkus/ubi-quarkus-native-image:19.0.2";

private String containerRuntime = "";

Expand Down Expand Up @@ -518,10 +518,10 @@ private boolean isThisGraalVMRCObsolete() {
final String vmName = System.getProperty("java.vm.name");
log.info("Running Quarkus native-image plugin on " + vmName);
final List<String> obsoleteGraalVmVersions = Arrays.asList("-rc9", "-rc10", "-rc11", "-rc12", "-rc13", "-rc14",
"-rc15");
"-rc15", "-rc16", "19.0.0");
final boolean vmVersionIsObsolete = obsoleteGraalVmVersions.stream().anyMatch(vmName::contains);
if (vmVersionIsObsolete) {
log.error("Out of date RC build of GraalVM detected! Please upgrade to GraalVM RC16");
log.error("Out of date RC build of GraalVM detected! Please upgrade to GraalVM 19.0.2");
return true;
}
return false;
Expand Down
4 changes: 2 additions & 2 deletions docs/src/main/asciidoc/openshift-s2i-guide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ We are going to create an OpenShift `build` executing it:
[source,shell, subs="attributes"]
----
# To build the image on OpenShift
oc new-app quay.io/quarkus/centos-quarkus-native-s2i~{quickstarts-clone-url} --context-dir=getting-started --name=quarkus-quickstart-native
oc new-app quay.io/quarkus/ubi-quarkus-native-s2i:{graalvm-version}~{quickstarts-clone-url} --context-dir=getting-started --name=quarkus-quickstart-native
oc logs -f bc/quarkus-quickstart-native
# To create the route
Expand Down Expand Up @@ -111,7 +111,7 @@ The end result is an image that is less than 40 MB in size (compressed) and does
The minimal build is depending on the S2I build since it is using the output (native runnable application) from the S2I build. However, you do not need to create an application with `oc new-app`. Instead you could use `oc new-build` like this:
[source, shell, subs="attributes"]
----
oc new-build quay.io/quarkus/centos-quarkus-native-s2i~{quickstarts-clone-url} \
oc new-build quay.io/quarkus/ubi-quarkus-native-s2i:{graalvm-version}~{quickstarts-clone-url} \
--context-dir=getting-started --name=quarkus-quickstart-native
----
====
Expand Down

0 comments on commit fb966c7

Please sign in to comment.