From bd2a86da2a54426fddbdf7d232bd837dc5106e46 Mon Sep 17 00:00:00 2001 From: Olya Gupalo Date: Tue, 4 Mar 2025 17:24:22 +0200 Subject: [PATCH 1/3] Remove the deprecated -H:+StaticExecutableWithDynamicLibC --- native-image/clouds/native-oci-cloud-shell/pom.xml | 4 ---- native-image/microservices/micronaut-hello-rest-maven/pom.xml | 2 -- 2 files changed, 6 deletions(-) diff --git a/native-image/clouds/native-oci-cloud-shell/pom.xml b/native-image/clouds/native-oci-cloud-shell/pom.xml index 89c164255..d7c456c06 100644 --- a/native-image/clouds/native-oci-cloud-shell/pom.xml +++ b/native-image/clouds/native-oci-cloud-shell/pom.xml @@ -80,10 +80,6 @@ -H:+ReportExceptionStackTraces - - - - diff --git a/native-image/microservices/micronaut-hello-rest-maven/pom.xml b/native-image/microservices/micronaut-hello-rest-maven/pom.xml index 068a18ac6..8d7b32e75 100644 --- a/native-image/microservices/micronaut-hello-rest-maven/pom.xml +++ b/native-image/microservices/micronaut-hello-rest-maven/pom.xml @@ -119,8 +119,6 @@ true -H:+ReportExceptionStackTraces - - From 3dd41735c31e9ecb66eaacb1cfa78840fca1def7 Mon Sep 17 00:00:00 2001 From: Olya Gupalo Date: Tue, 4 Mar 2025 17:32:05 +0200 Subject: [PATCH 2/3] Move Spring Jibber and Tiny Java Containers demos one level up --- .../workflows/containerize-spring-boot-jibber.yml | 12 ++++++------ .../workflows/containerize-tiny-java-containers.yml | 10 +++++----- README.md | 4 ++-- .../.mvn/wrapper/maven-wrapper.properties | 0 .../Dockerfiles/Dockerfile | 0 .../Dockerfiles/Dockerfile.jvm | 0 .../Dockerfiles/Dockerfile.native | 0 .../spring-boot-microservice-jibber/README.md | 0 .../example/benchmarks/jibber/DemoApplication.java | 0 .../com/example/benchmarks/jibber/Jabberwocky.java | 0 .../main/resources/application.properties | 0 .../spring-boot-microservice-jibber/mvnw | 0 .../spring-boot-microservice-jibber/mvnw.cmd | 0 .../spring-boot-microservice-jibber/pom.xml | 0 .../spring-boot-microservice-jibber/run.sh | 0 .../example/benchmarks/jibber/DemoApplication.java | 0 .../com/example/benchmarks/jibber/Jabberwocky.java | 0 .../src/main/resources/application.properties | 0 .../tiny-java-containers/README.md | 0 .../tiny-java-containers/clean.sh | 0 .../tiny-java-containers/helloworld/Dockerfile | 0 .../tiny-java-containers/helloworld/Hello.java | 0 .../tiny-java-containers/helloworld/build.sh | 0 .../tiny-java-containers/helloworld/clean.sh | 0 .../tiny-java-containers/images/keyboard.jpg | Bin .../tiny-java-containers/images/linkingoptions.png | Bin .../tiny-java-containers/images/youtube.png | Bin .../jwebserver/Dockerfile.alpine.static | 0 .../jwebserver/Dockerfile.distroless-base.mostly | 0 .../Dockerfile.distroless-java-base.dynamic | 0 .../Dockerfile.distroless-java-base.jlink | 0 .../jwebserver/Dockerfile.distroless-static.static | 0 .../jwebserver/Dockerfile.jvm-debian-slim | 0 .../jwebserver/Dockerfile.jvm-distroless-java | 0 .../jwebserver/Dockerfile.jvm-eclipse-temurin | 0 .../jwebserver/Dockerfile.scratch.static | 0 .../jwebserver/Dockerfile.scratch.static-upx | 0 .../tiny-java-containers/jwebserver/build-all.sh | 0 .../jwebserver/build-dynamic.sh | 0 .../tiny-java-containers/jwebserver/build-jlink.sh | 0 .../tiny-java-containers/jwebserver/build-jvm.sh | 0 .../tiny-java-containers/jwebserver/build-mostly.sh | 0 .../tiny-java-containers/jwebserver/build-static.sh | 0 .../tiny-java-containers/jwebserver/clean.sh | 0 .../tiny-java-containers/jwebserver/index.html | 0 45 files changed, 13 insertions(+), 13 deletions(-) rename native-image/{containerize => }/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/Dockerfiles/Dockerfile (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.jvm (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.native (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/README.md (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/DemoApplication.java (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/Jabberwocky.java (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/main/resources/application.properties (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/mvnw (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/mvnw.cmd (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/pom.xml (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/run.sh (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/DemoApplication.java (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/Jabberwocky.java (100%) rename native-image/{containerize => }/spring-boot-microservice-jibber/src/main/resources/application.properties (100%) rename native-image/{containerize => }/tiny-java-containers/README.md (100%) rename native-image/{containerize => }/tiny-java-containers/clean.sh (100%) rename native-image/{containerize => }/tiny-java-containers/helloworld/Dockerfile (100%) rename native-image/{containerize => }/tiny-java-containers/helloworld/Hello.java (100%) rename native-image/{containerize => }/tiny-java-containers/helloworld/build.sh (100%) rename native-image/{containerize => }/tiny-java-containers/helloworld/clean.sh (100%) rename native-image/{containerize => }/tiny-java-containers/images/keyboard.jpg (100%) rename native-image/{containerize => }/tiny-java-containers/images/linkingoptions.png (100%) rename native-image/{containerize => }/tiny-java-containers/images/youtube.png (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.alpine.static (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.distroless-base.mostly (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.dynamic (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.jlink (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.distroless-static.static (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.jvm-debian-slim (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.jvm-distroless-java (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.jvm-eclipse-temurin (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.scratch.static (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/Dockerfile.scratch.static-upx (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-all.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-dynamic.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-jlink.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-jvm.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-mostly.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/build-static.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/clean.sh (100%) rename native-image/{containerize => }/tiny-java-containers/jwebserver/index.html (100%) diff --git a/.github/workflows/containerize-spring-boot-jibber.yml b/.github/workflows/containerize-spring-boot-jibber.yml index 167cc0147..b5cf3581c 100644 --- a/.github/workflows/containerize-spring-boot-jibber.yml +++ b/.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 & diff --git a/.github/workflows/containerize-tiny-java-containers.yml b/.github/workflows/containerize-tiny-java-containers.yml index 2ffa711c0..5b6792a18 100644 --- a/.github/workflows/containerize-tiny-java-containers.yml +++ b/.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,7 +11,7 @@ permissions: contents: read jobs: run: - name: Run 'native-image/containerize/tiny-java-containers' + name: Run 'native-image/tiny-java-containers' runs-on: ubuntu-20.04 # Docker has changed its behavior on Ubuntu 22.04 timeout-minutes: 20 strategy: @@ -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 diff --git a/README.md b/README.md index 398b1be42..a48fb5512 100644 --- a/README.md +++ b/README.md @@ -41,8 +41,8 @@ Demos illustrating how to compile applications with Native Image that use some d ### Containerize Demos focusing on containerizing native Java applications and following best practices. -* [spring-boot-microservice-jibber](native-image/containerize/spring-boot-microservice-jibber/) - Demonstrates how to create a native executable for a Spring Boot web server, containerize it, and run -* [tiny-java-containers](native-image/containerize/tiny-java-containers/) - Shows how a simple Java application and the `jdk.httpserver` module can be compiled to produce small container images +* [spring-boot-microservice-jibber](native-image/spring-boot-microservice-jibber/) - Demonstrates how to create a native executable for a Spring Boot web server, containerize it, and run +* [tiny-java-containers](native-image/tiny-java-containers/) - Shows how a simple Java application and the `jdk.httpserver` module can be compiled to produce small container images ### Monitor Demos showcasing how to monitor native applications using observability and diagnostics tools. diff --git a/native-image/containerize/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties b/native-image/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties rename to native-image/spring-boot-microservice-jibber/.mvn/wrapper/maven-wrapper.properties diff --git a/native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile b/native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile rename to native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile diff --git a/native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.jvm b/native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.jvm similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.jvm rename to native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.jvm diff --git a/native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.native b/native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.native similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.native rename to native-image/spring-boot-microservice-jibber/Dockerfiles/Dockerfile.native diff --git a/native-image/containerize/spring-boot-microservice-jibber/README.md b/native-image/spring-boot-microservice-jibber/README.md similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/README.md rename to native-image/spring-boot-microservice-jibber/README.md diff --git a/native-image/containerize/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/DemoApplication.java b/native-image/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/DemoApplication.java similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/DemoApplication.java rename to native-image/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/DemoApplication.java diff --git a/native-image/containerize/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/Jabberwocky.java b/native-image/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/Jabberwocky.java similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/Jabberwocky.java rename to native-image/spring-boot-microservice-jibber/main/java/com/example/benchmarks/jibber/Jabberwocky.java diff --git a/native-image/containerize/spring-boot-microservice-jibber/main/resources/application.properties b/native-image/spring-boot-microservice-jibber/main/resources/application.properties similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/main/resources/application.properties rename to native-image/spring-boot-microservice-jibber/main/resources/application.properties diff --git a/native-image/containerize/spring-boot-microservice-jibber/mvnw b/native-image/spring-boot-microservice-jibber/mvnw similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/mvnw rename to native-image/spring-boot-microservice-jibber/mvnw diff --git a/native-image/containerize/spring-boot-microservice-jibber/mvnw.cmd b/native-image/spring-boot-microservice-jibber/mvnw.cmd similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/mvnw.cmd rename to native-image/spring-boot-microservice-jibber/mvnw.cmd diff --git a/native-image/containerize/spring-boot-microservice-jibber/pom.xml b/native-image/spring-boot-microservice-jibber/pom.xml similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/pom.xml rename to native-image/spring-boot-microservice-jibber/pom.xml diff --git a/native-image/containerize/spring-boot-microservice-jibber/run.sh b/native-image/spring-boot-microservice-jibber/run.sh similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/run.sh rename to native-image/spring-boot-microservice-jibber/run.sh diff --git a/native-image/containerize/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/DemoApplication.java b/native-image/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/DemoApplication.java similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/DemoApplication.java rename to native-image/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/DemoApplication.java diff --git a/native-image/containerize/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/Jabberwocky.java b/native-image/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/Jabberwocky.java similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/Jabberwocky.java rename to native-image/spring-boot-microservice-jibber/src/main/java/com/example/benchmarks/jibber/Jabberwocky.java diff --git a/native-image/containerize/spring-boot-microservice-jibber/src/main/resources/application.properties b/native-image/spring-boot-microservice-jibber/src/main/resources/application.properties similarity index 100% rename from native-image/containerize/spring-boot-microservice-jibber/src/main/resources/application.properties rename to native-image/spring-boot-microservice-jibber/src/main/resources/application.properties diff --git a/native-image/containerize/tiny-java-containers/README.md b/native-image/tiny-java-containers/README.md similarity index 100% rename from native-image/containerize/tiny-java-containers/README.md rename to native-image/tiny-java-containers/README.md diff --git a/native-image/containerize/tiny-java-containers/clean.sh b/native-image/tiny-java-containers/clean.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/clean.sh rename to native-image/tiny-java-containers/clean.sh diff --git a/native-image/containerize/tiny-java-containers/helloworld/Dockerfile b/native-image/tiny-java-containers/helloworld/Dockerfile similarity index 100% rename from native-image/containerize/tiny-java-containers/helloworld/Dockerfile rename to native-image/tiny-java-containers/helloworld/Dockerfile diff --git a/native-image/containerize/tiny-java-containers/helloworld/Hello.java b/native-image/tiny-java-containers/helloworld/Hello.java similarity index 100% rename from native-image/containerize/tiny-java-containers/helloworld/Hello.java rename to native-image/tiny-java-containers/helloworld/Hello.java diff --git a/native-image/containerize/tiny-java-containers/helloworld/build.sh b/native-image/tiny-java-containers/helloworld/build.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/helloworld/build.sh rename to native-image/tiny-java-containers/helloworld/build.sh diff --git a/native-image/containerize/tiny-java-containers/helloworld/clean.sh b/native-image/tiny-java-containers/helloworld/clean.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/helloworld/clean.sh rename to native-image/tiny-java-containers/helloworld/clean.sh diff --git a/native-image/containerize/tiny-java-containers/images/keyboard.jpg b/native-image/tiny-java-containers/images/keyboard.jpg similarity index 100% rename from native-image/containerize/tiny-java-containers/images/keyboard.jpg rename to native-image/tiny-java-containers/images/keyboard.jpg diff --git a/native-image/containerize/tiny-java-containers/images/linkingoptions.png b/native-image/tiny-java-containers/images/linkingoptions.png similarity index 100% rename from native-image/containerize/tiny-java-containers/images/linkingoptions.png rename to native-image/tiny-java-containers/images/linkingoptions.png diff --git a/native-image/containerize/tiny-java-containers/images/youtube.png b/native-image/tiny-java-containers/images/youtube.png similarity index 100% rename from native-image/containerize/tiny-java-containers/images/youtube.png rename to native-image/tiny-java-containers/images/youtube.png diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.alpine.static b/native-image/tiny-java-containers/jwebserver/Dockerfile.alpine.static similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.alpine.static rename to native-image/tiny-java-containers/jwebserver/Dockerfile.alpine.static diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-base.mostly b/native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-base.mostly similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-base.mostly rename to native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-base.mostly diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.dynamic b/native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.dynamic similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.dynamic rename to native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.dynamic diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.jlink b/native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.jlink similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.jlink rename to native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-java-base.jlink diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-static.static b/native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-static.static similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.distroless-static.static rename to native-image/tiny-java-containers/jwebserver/Dockerfile.distroless-static.static diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-debian-slim b/native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-debian-slim similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-debian-slim rename to native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-debian-slim diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-distroless-java b/native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-distroless-java similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-distroless-java rename to native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-distroless-java diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-eclipse-temurin b/native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-eclipse-temurin similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.jvm-eclipse-temurin rename to native-image/tiny-java-containers/jwebserver/Dockerfile.jvm-eclipse-temurin diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.scratch.static b/native-image/tiny-java-containers/jwebserver/Dockerfile.scratch.static similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.scratch.static rename to native-image/tiny-java-containers/jwebserver/Dockerfile.scratch.static diff --git a/native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.scratch.static-upx b/native-image/tiny-java-containers/jwebserver/Dockerfile.scratch.static-upx similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/Dockerfile.scratch.static-upx rename to native-image/tiny-java-containers/jwebserver/Dockerfile.scratch.static-upx diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-all.sh b/native-image/tiny-java-containers/jwebserver/build-all.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-all.sh rename to native-image/tiny-java-containers/jwebserver/build-all.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-dynamic.sh b/native-image/tiny-java-containers/jwebserver/build-dynamic.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-dynamic.sh rename to native-image/tiny-java-containers/jwebserver/build-dynamic.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-jlink.sh b/native-image/tiny-java-containers/jwebserver/build-jlink.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-jlink.sh rename to native-image/tiny-java-containers/jwebserver/build-jlink.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-jvm.sh b/native-image/tiny-java-containers/jwebserver/build-jvm.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-jvm.sh rename to native-image/tiny-java-containers/jwebserver/build-jvm.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-mostly.sh b/native-image/tiny-java-containers/jwebserver/build-mostly.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-mostly.sh rename to native-image/tiny-java-containers/jwebserver/build-mostly.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/build-static.sh b/native-image/tiny-java-containers/jwebserver/build-static.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/build-static.sh rename to native-image/tiny-java-containers/jwebserver/build-static.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/clean.sh b/native-image/tiny-java-containers/jwebserver/clean.sh similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/clean.sh rename to native-image/tiny-java-containers/jwebserver/clean.sh diff --git a/native-image/containerize/tiny-java-containers/jwebserver/index.html b/native-image/tiny-java-containers/jwebserver/index.html similarity index 100% rename from native-image/containerize/tiny-java-containers/jwebserver/index.html rename to native-image/tiny-java-containers/jwebserver/index.html From 4ba5c8a30e00cf8e554decb420796c25d2077c58 Mon Sep 17 00:00:00 2001 From: Olya Gupalo Date: Tue, 4 Mar 2025 17:43:08 +0200 Subject: [PATCH 3/3] Ubuntu 20.04 LTS runner will be removed on 2025-04-01. --- .github/workflows/containerize-tiny-java-containers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/containerize-tiny-java-containers.yml b/.github/workflows/containerize-tiny-java-containers.yml index 5b6792a18..6bf038da9 100644 --- a/.github/workflows/containerize-tiny-java-containers.yml +++ b/.github/workflows/containerize-tiny-java-containers.yml @@ -12,7 +12,7 @@ permissions: jobs: run: name: Run 'native-image/tiny-java-containers' - runs-on: ubuntu-20.04 # Docker has changed its behavior on Ubuntu 22.04 + runs-on: ubuntu-latest timeout-minutes: 20 strategy: matrix: