Merge pull request #336 from graalvm/move-tiny-containers-demo

[GR-60094] Move tiny containers demo under native-image/containerize category.

Author: olyagpl

.github/workflows/native-image-containerize.yml renamed to .github/workflows/containerize-spring-boot-jibber.yml

@@ -1,21 +1,21 @@
-name: native-image/containerize
+name: native-image/containerize/spring-boot-microservice-jibber
 on:
   push:
     paths:
-      - 'native-image/containerize/**'
-      - '.github/workflows/native-image-containerize.yml'
+      - 'native-image/containerize/spring-boot-microservice-jibber/**'
+      - '.github/workflows/containerize-spring-boot-jibber.yml'
   pull_request:
     paths:
-      - 'native-image/containerize/**'
-      - '.github/workflows/native-image-containerize.yml'
+      - 'native-image/containerize/spring-boot-microservice-jibber/**'
+      - '.github/workflows/containerize-spring-boot-jibber.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
 permissions:
   contents: read
 jobs:
   run:
-    name: Run 'native-image/containerize'
+    name: Run 'native-image/containerize/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'
+      - name: Run 'native-image/containerize/spring-boot-microservice-jibber'
         run: |
-          cd native-image/containerize
+          cd native-image/containerize/spring-boot-microservice-jibber
           mvn --no-transfer-progress package
           mvn --no-transfer-progress native:compile -Pnative
           ./target/benchmark-jibber &

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

@@ -1,30 +1,33 @@
-name: tiny-java-containers
+name: native-image/containerize/tiny-java-containers
 on:
   push:
     paths:
-      - 'tiny-java-containers/**'
-      - '.github/workflows/tiny-java-containers.yml'
+      - 'native-image/containerize/tiny-java-containers/**'
+      - '.github/workflows/containerize-tiny-java-containers.yml'
   schedule:
     - cron: "0 0 1 * *" # run every month
   workflow_dispatch:
 permissions:
   contents: read
 jobs:
   run:
-    name: Run 'tiny-java-containers'
+    name: Run 'native-image/containerize/tiny-java-containers'
     runs-on: ubuntu-20.04 # Docker has changed its behavior on Ubuntu 22.04
     timeout-minutes: 20
+    strategy:
+      matrix:
+        java-version: ['21', '24-ea']
     steps:
       - uses: actions/checkout@v4
       - uses: graalvm/setup-graalvm@v1
         with:
-          java-version: '21'
+          java-version: ${{ matrix.java-version }}
           distribution: 'graalvm'
           github-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Run 'tiny-java-containers'
+      - name: Run 'native-image/containerize/tiny-java-containers'
         run: |
           sleep_period=5
-          cd tiny-java-containers
+          cd native-image/containerize/tiny-java-containers
           # Hello World
           #
           cd helloworld

README.md

@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2023, Oracle and/or its affiliates.
+ * Released under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl/.
+ */
+
+package com.example.benchmarks.jibber;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@SpringBootApplication
+@RestController
+public class DemoApplication {
+
+    @Autowired
+    Jabberwocky j;
+
+	public static void main(String[] args) {
+	    SpringApplication.run(DemoApplication.class, args);
+	}
+
+    @RequestMapping(method = RequestMethod.GET, path = "/jibber")
+    ResponseEntity<String> jibber() {
+	    return ResponseEntity.ok(j.generate());
+    }
+}

native-image/containerize/.mvn/wrapper/maven-wrapper.properties renamed to native-image/containerize/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2023, Oracle and/or its affiliates.
+ * Released under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl/.
+ */
+
+package com.example.benchmarks.jibber;
+
+import org.springframework.context.annotation.Scope;
+import org.springframework.stereotype.Service;
+
+import rita.RiMarkov;
+
+@Service
+@Scope("singleton")
+public class Jabberwocky {
+    //
+    private RiMarkov r;
+
+    public Jabberwocky() {
+        loadModel();
+    }
+
+    private void loadModel() {
+        //
+        String text = "’Twas brillig, and the slithy toves " +
+                "Did gyre and gimble in the wabe: " +
+                "All mimsy were the borogoves, " +
+                "And the mome raths outgrabe. " +
+                "Beware the Jabberwock, my son! " +
+                "The jaws that bite, the claws that catch! " +
+                "Beware the Jubjub bird, and shun " +
+                "The frumious Bandersnatch! " +
+                "He took his vorpal sword in hand; " +
+                "Long time the manxome foe he sought— " +
+                "So rested he by the Tumtum tree " +
+                "And stood awhile in thought. " +
+                "And, as in uffish thought he stood, " +
+                "The Jabberwock, with eyes of flame, " +
+                "Came whiffling through the tulgey wood, " +
+                "And burbled as it came! " +
+                "One, two! One, two! And through and through " +
+                "The vorpal blade went snicker-snack! " +
+                "He left it dead, and with its head " +
+                "He went galumphing back. " +
+                "And hast thou slain the Jabberwock? " +
+                "Come to my arms, my beamish boy! " +
+                "O frabjous day! Callooh! Callay! " +
+                "He chortled in his joy. " +
+                "’Twas brillig, and the slithy toves " +
+                "Did gyre and gimble in the wabe: " +
+                "All mimsy were the borogoves, " +
+                "And the mome raths outgrabe.";
+        this.r = new RiMarkov(3);
+        this.r.addText(text);
+    }
+    public String generate() {
+        String[] lines = this.r.generate(10);
+        StringBuilder b = new StringBuilder();
+        //
+        for (String line : lines ) {
+            b.append(line);
+            b.append("<br/>\n");
+        }
+        //
+        return b.toString();
+    }
+
+}

native-image/containerize/Dockerfiles/Dockerfile renamed to native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile

@@ -0,0 +1 @@
+management.endpoints.web.exposure.include=metrics,health,info,prometheus