Fixs conflicts

quarkusio · Nov 22, 2021 · e17db85 · e17db85
2 parents 1aaca12 + 8c32b9a
commit e17db85
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 55 deletions.
diff --git a/...main/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-layout.include.qute b/...main/resources/codestarts/quarkus/tooling/dockerfiles/base/Dockerfile-layout.include.qute
@@ -18,31 +18,18 @@
 #
 # Then run the container using :
 #
-# docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/{project.artifact-id}-{type}
+# docker run -i --rm -p 8080:8080 quarkus/{project.artifact-id}-{type}
 #
 ###
-FROM {#insert image /}
-{#insert args /}
+FROM registry.access.redhat.com/ubi8/openjdk-{java.version}-runtime:1.10
+
 ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
-# Install java and the run-java script
-# Also set up permissions for user `1001`
-RUN microdnf install curl ca-certificates $\{JAVA_PACKAGE} \
-    && microdnf update \
-    && microdnf clean all \
-    && mkdir /deployments \
-    && chown 1001 /deployments \
-    && chmod "g+rwX" /deployments \
-    && chown 1001:root /deployments \
-    && curl https://repo1.maven.org/maven2/io/fabric8/run-java-sh/$\{RUN_JAVA_VERSION}/run-java-sh-$\{RUN_JAVA_VERSION}-sh.sh -o /deployments/run-java.sh \
-    && chown 1001 /deployments/run-java.sh \
-    && chmod 540 /deployments/run-java.sh \
-    && echo "securerandom.source=file:/dev/urandom" >> /etc/alternatives/jre/conf/security/java.security
 
 # Configure the JAVA_OPTIONS, you can add -XshowSettings:vm to also display the heap size.
 ENV JAVA_OPTIONS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 {#insert copy /}
 
 EXPOSE 8080
-USER 1001
+USER 185
 
-ENTRYPOINT [ "/deployments/run-java.sh" ]
+ENTRYPOINT [ "java", "-jar", "/deployments/quarkus-run.jar" ]
diff --git a/...urces/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm b/...urces/codestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.jvm
@@ -1,16 +1,11 @@
 {#include Dockerfile-layout type='jvm'}
     {#quarkusbuild}{buildtool.cli} {buildtool.cmd.package}{/quarkusbuild}
-    {#image}{dockerfile.jvm.from} {/image}
-    {#args}
-ARG JAVA_PACKAGE=java-{java.version}-openjdk-headless
-ARG RUN_JAVA_VERSION={dockerfile.jvm.run-java-version}
-    {/args}
     {#copy}
 # We make four distinct layers so if there are application changes the library layers can be re-used
-COPY --chown=1001 {buildtool.build-dir}/quarkus-app/lib/ /deployments/lib/
-COPY --chown=1001 {buildtool.build-dir}/quarkus-app/*.jar /deployments/
-COPY --chown=1001 {buildtool.build-dir}/quarkus-app/app/ /deployments/app/
-COPY --chown=1001 {buildtool.build-dir}/quarkus-app/quarkus/ /deployments/quarkus/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/lib/ /deployments/lib/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/*.jar /deployments/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/app/ /deployments/app/
+COPY --chown=185 {buildtool.build-dir}/quarkus-app/quarkus/ /deployments/quarkus/
     {/copy}
 {/include}
 
diff --git a/...odestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar b/...odestarts/quarkus/tooling/dockerfiles/base/src/main/docker/Dockerfile.tpl.qute.legacy-jar
@@ -1,12 +1,7 @@
 {#include Dockerfile-layout type='legacy-jar'}
     {#quarkusbuild}{buildtool.cli} {buildtool.cmd.package-legacy-jar}{/quarkusbuild}
-    {#image}{dockerfile.legacy-jar.from} {/image}
-    {#args}
-ARG JAVA_PACKAGE=java-{java.version}-openjdk-headless
-ARG RUN_JAVA_VERSION={dockerfile.legacy-jar.run-java-version}
-    {/args}
     {#copy}
 COPY {buildtool.build-dir}/lib/* /deployments/lib/
-COPY {buildtool.build-dir}/*-runner.jar /deployments/app.jar
+COPY {buildtool.build-dir}/*-runner.jar /deployments/quarkus-run.jar
     {/copy}
 {/include}
diff --git a/...s/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml b/...s/base-codestarts/src/main/resources/codestarts/quarkus/tooling/dockerfiles/codestart.yml
@@ -4,14 +4,6 @@ language:
   base:
     data:
       dockerfile:
-        jvm:
-          from: registry.access.redhat.com/ubi8/ubi-minimal:8.4
-          java-package: java-11-openjdk-headless
-          run-java-version: 1.3.8
-        legacy-jar:
-          from: registry.access.redhat.com/ubi8/ubi-minimal:8.4
-          java-package: java-11-openjdk-headless
-          run-java-version: 1.3.8
         native:
           from: registry.access.redhat.com/ubi8/ubi-minimal:8.4
         native-distroless:

diff --git a/...evtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java b/...evtools-common/src/main/java/io/quarkus/devtools/project/codegen/CreateProjectHelper.java
@@ -21,10 +21,7 @@
 public class CreateProjectHelper {
 
     private static final List<Integer> JAVA_VERSIONS_LTS = List.of(8, 11, 17);
-<<<<<<< HEAD
     private static final int DEFAULT_JAVA_VERSION = 11;
-=======
->>>>>>> c1f2faf27d... Adding support to java versions lts
     private static final Pattern JAVA_VERSION_PATTERN = Pattern.compile("(?:1\\.)?(\\d+)(?:\\..*)?");
 
     public static final String DEFAULT_GROUP_ID = "org.acme";
@@ -86,12 +83,6 @@ public static void setJavaVersion(Map<String, Object> values, String javaTarget)
         Matcher matcher = JAVA_VERSION_PATTERN
                 .matcher(javaTarget != null ? javaTarget : System.getProperty("java.version", ""));
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-        System.out.println("version: " + System.getProperty("java.version", ""));
-
-=======
->>>>>>> abee280ca2... Remove sysout
         if (matcher.matches()) {
             int versionExtracted = Integer.parseInt(matcher.group(1));
             int version = JAVA_VERSIONS_LTS.stream()
@@ -101,11 +92,6 @@ public static void setJavaVersion(Map<String, Object> values, String javaTarget)
             values.put(ProjectGenerator.JAVA_TARGET, String.valueOf(version));
         } else {
             values.put(ProjectGenerator.JAVA_TARGET, String.valueOf(DEFAULT_JAVA_VERSION));
-=======
-        int versionExtracted = Integer.parseInt(matcher.group(1));
-        if (JAVA_VERSIONS_LTS.contains(versionExtracted)) {
-            values.put(ProjectGenerator.JAVA_TARGET, String.valueOf(versionExtracted));
->>>>>>> c1f2faf27d... Adding support to java versions lts
         }
     }