Merge pull request #344 from graalvm/containerization-demos

Move Spring Jibber and Tiny Java Containers demos one level up

Author: shaunsmith

.github/workflows/containerize-spring-boot-jibber.yml

@@ -1,12 +1,12 @@
-name: native-image/containerize/spring-boot-microservice-jibber
+name: native-image/spring-boot-microservice-jibber
 on:
   push:
     paths:
-      - 'native-image/containerize/spring-boot-microservice-jibber/**'
+      - 'native-image/spring-boot-microservice-jibber/**'
       - '.github/workflows/containerize-spring-boot-jibber.yml'
   pull_request:
     paths:
-      - 'native-image/containerize/spring-boot-microservice-jibber/**'
+      - 'native-image/spring-boot-microservice-jibber/**'
       - '.github/workflows/containerize-spring-boot-jibber.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
@@ -15,7 +15,7 @@ permissions:
   contents: read
 jobs:
   run:
-    name: Run 'native-image/containerize/spring-boot-microservice-jibber'
+    name: Run 'native-image/spring-boot-microservice-jibber'
     runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
@@ -30,9 +30,9 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           cache: 'maven'
           native-image-job-reports: 'true'
-      - name: Run 'native-image/containerize/spring-boot-microservice-jibber'
+      - name: Run 'native-image/spring-boot-microservice-jibber'
         run: |
-          cd native-image/containerize/spring-boot-microservice-jibber
+          cd native-image/spring-boot-microservice-jibber
           mvn --no-transfer-progress package
           mvn --no-transfer-progress native:compile -Pnative
           ./target/benchmark-jibber &

.github/workflows/containerize-tiny-java-containers.yml

@@ -1,8 +1,8 @@
-name: native-image/containerize/tiny-java-containers
+name: native-image/tiny-java-containers
 on:
   push:
     paths:
-      - 'native-image/containerize/tiny-java-containers/**'
+      - 'native-image/tiny-java-containers/**'
       - '.github/workflows/containerize-tiny-java-containers.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
@@ -11,8 +11,8 @@ permissions:
   contents: read
 jobs:
   run:
-    name: Run 'native-image/containerize/tiny-java-containers'
-    runs-on: ubuntu-20.04 # Docker has changed its behavior on Ubuntu 22.04
+    name: Run 'native-image/tiny-java-containers'
+    runs-on: ubuntu-latest
     timeout-minutes: 20
     strategy:
       matrix:
@@ -24,10 +24,10 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run 'native-image/containerize/tiny-java-containers'
+      - name: Run 'native-image/tiny-java-containers'
         run: |
           sleep_period=5
-          cd native-image/containerize/tiny-java-containers
+          cd native-image/tiny-java-containers
           # Hello World
           #
           cd helloworld

README.md

@@ -80,10 +80,6 @@
               <!-- <quickBuild>true</quickBuild> -->
               <buildArgs>
                 <buildArg>-H:+ReportExceptionStackTraces</buildArg>
-                <!-- For mostly static native image (only on Linux AMD64 systems) -->
-                <!-- <buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg> -->
-                <!-- To generate the Native Image build output JSON -->
-                <!-- <buildArg>-H:BuildOutputJSONFile=build.json</buildArg> -->
               </buildArgs>
             </configuration>
           </plugin>

native-image/clouds/native-oci-cloud-shell/pom.xml

@@ -119,8 +119,6 @@
           <quickBuild>true</quickBuild>
           <buildArgs combine.children="append">
             <buildArg>-H:+ReportExceptionStackTraces</buildArg>
-            <!-- For mostly static native image (only on Linux systems) -->
-            <!-- <buildArg>-H:+StaticExecutableWithDynamicLibC</buildArg> -->
           </buildArgs>
         </configuration>
       </plugin>