Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add more tests for Docker packagings #962

Merged
merged 16 commits into from
Jan 24, 2024
Merged

Add more tests for Docker packagings #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
34f315d
Add more tests for Docker packagings
alvarosanchez Jan 23, 2024
dea3237
Enable more Docker tests
alvarosanchez Jan 23, 2024
aebbf11
Fix package-docker-native test project
alvarosanchez Jan 23, 2024
7a40472
Change default X86 image
alvarosanchez Jan 23, 2024
c0f7e42
Use wolfi as base image for all archs
alvarosanchez Jan 23, 2024
a2894fa
Checkstyle
alvarosanchez Jan 23, 2024
1de5ead
Default to cgr.dev/chainguard/wolfi-base:latest
alvarosanchez Jan 23, 2024
cf6cab2
Fix CRaC packaging
alvarosanchez Jan 24, 2024
1cc598b
Rework integration test
alvarosanchez Jan 24, 2024
f98cf4c
Fix test
alvarosanchez Jan 24, 2024
900dcdc
Merge branch 'master' into docker_tests
alvarosanchez Jan 24, 2024
5afab56
Fix distroless test
alvarosanchez Jan 24, 2024
e37d041
Fix static test
alvarosanchez Jan 24, 2024
2963f2f
Fix test
alvarosanchez Jan 24, 2024
9254fe2
Fix test
alvarosanchez Jan 24, 2024
f9be48d
Fix Dockerfile tests
alvarosanchez Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions micronaut-maven-integration-tests/src/it/aot-sample/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/deploy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -106,7 +106,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...ration-tests/src/it/deploy/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
2 changes: 2 additions & 0 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-crac/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ COPY --from=crac-checkpoint /home/app/classes /home/app/classes
COPY --from=crac-checkpoint /home/app/libs /home/app/libs
COPY scripts/run.sh /home/app/run.sh

EXPOSE 8080

ENTRYPOINT ["/home/app/run.sh"]
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-crac/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -122,7 +122,7 @@
<image>ubuntu:18.04</image>
</from>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion .../it/dockerfile-docker-crac/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-lambda/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -105,7 +105,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...t/dockerfile-docker-lambda/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
2 changes: 1 addition & 1 deletion micronaut-maven-integration-tests/src/it/dockerfile-docker-native-distroless/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ COPY dependency/* /home/app/libs/
COPY *.args /home/app/graalvm-native-image.args
RUN native-image @/home/app/graalvm-native-image.args -H:Class=io.micronaut.build.examples.Application -H:Name=application -cp "/home/app/libs/*:/home/app/classes/"

FROM gcr.io/distroless/cc-debian10
FROM gcr.io/distroless/cc-debian12
COPY --from=builder /home/app/application /app/application

EXPOSE 8080
Expand Down
8 changes: 4 additions & 4 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-distroless/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -81,7 +81,7 @@
<artifactId>micronaut-maven-plugin</artifactId>
<version>${micronaut-maven-plugin.version}</version>
<configuration>
<baseImageRun>gcr.io/distroless/cc-debian10</baseImageRun>
<baseImageRun>gcr.io/distroless/cc-debian12</baseImageRun>
<nativeImageBuildArgs>-Ob</nativeImageBuildArgs>
</configuration>
</plugin>
Expand Down Expand Up @@ -110,7 +110,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...e-docker-native-distroless/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-lambda/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -109,7 +109,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...rfile-docker-native-lambda/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
1 change: 0 additions & 1 deletion ...naut-maven-integration-tests/src/it/dockerfile-docker-native-netty-custom-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ COPY *.args /home/app/graalvm-native-image.args
RUN native-image @/home/app/graalvm-native-image.args -H:Class=io.micronaut.build.examples.Application -H:Name=application -cp "/home/app/libs/*:/home/app/classes/"

FROM ubuntu

COPY --from=builder /home/app/application /app/application

EXPOSE 8080
Expand Down
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-netty-custom-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -110,7 +110,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...r-native-netty-custom-base/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
1 change: 0 additions & 1 deletion ...native-netty-custom-ol/Dockerfile.aarch64 → ...-docker-native-netty-custom-ol/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ COPY *.args /home/app/graalvm-native-image.args
RUN native-image @/home/app/graalvm-native-image.args -H:Class=io.micronaut.build.examples.Application -H:Name=application -cp "/home/app/libs/*:/home/app/classes/"

FROM cgr.dev/chainguard/wolfi-base:latest

COPY --from=builder /home/app/application /app/application

EXPOSE 8080
Expand Down
14 changes: 0 additions & 14 deletions ...-maven-integration-tests/src/it/dockerfile-docker-native-netty-custom-ol/Dockerfile.amd64
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-netty-custom-ol/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -110,7 +110,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...ker-native-netty-custom-ol/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
13 changes: 2 additions & 11 deletions ...aut-maven-integration-tests/src/it/dockerfile-docker-native-netty-custom-ol/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
File dockerfile = new File("$basedir/target", "Dockerfile")
File expectedDockerfile = new File(basedir, "Dockerfile.${graalVmArch()}")
File expectedDockerfile = new File(basedir, "Dockerfile")
String expectedDockerfileText = expectedDockerfile.text.replace("17", "${System.getProperty("java.specification.version")}")

assert dockerfile.text == expectedDockerfileText

static String graalVmArch() {
String osArch = System.getProperty("os.arch")
if ("aarch64".equals(osArch)) {
return "aarch64"
} else {
return "amd64"
}
}
assert dockerfile.text == expectedDockerfileText
1 change: 0 additions & 1 deletion ...le-docker-native-netty/Dockerfile.aarch64 → ...dockerfile-docker-native-netty/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ COPY *.args /home/app/graalvm-native-image.args
RUN native-image @/home/app/graalvm-native-image.args -H:Class=io.micronaut.build.examples.Application -H:Name=application -cp "/home/app/libs/*:/home/app/classes/"

FROM cgr.dev/chainguard/wolfi-base:latest

COPY --from=builder /home/app/application /app/application

EXPOSE 8080
Expand Down
14 changes: 0 additions & 14 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-netty/Dockerfile.amd64
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-netty/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -109,7 +109,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...erfile-docker-native-netty/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
13 changes: 2 additions & 11 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-netty/verify.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
File dockerfile = new File("$basedir/target", "Dockerfile")
File expectedDockerfile = new File(basedir, "Dockerfile.${graalVmArch()}")
File expectedDockerfile = new File(basedir, "Dockerfile")
String expectedDockerfileText = expectedDockerfile.text.replace("17", "${System.getProperty("java.specification.version")}")

assert dockerfile.text == expectedDockerfileText

static String graalVmArch() {
String osArch = System.getProperty("os.arch")
if ("aarch64".equals(osArch)) {
return "aarch64"
} else {
return "amd64"
}
}
assert dockerfile.text == expectedDockerfileText
2 changes: 1 addition & 1 deletion micronaut-maven-integration-tests/src/it/dockerfile-docker-native-oracle-function/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN native-image @/home/app/graalvm-native-image.args --report-unsupported-eleme

FROM fnproject/fn-java-fdk:jre17-latest AS fnfdk

FROM frolvlad/alpine-glibc:glibc-2.34
FROM cgr.dev/chainguard/wolfi-base:latest
WORKDIR /function
COPY --from=builder /home/app/application /function/func
COPY --from=fnfdk /function/runtime/lib/* .
Expand Down
6 changes: 3 additions & 3 deletions micronaut-maven-integration-tests/src/it/dockerfile-docker-native-oracle-function/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
<scope>compile</scope>
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -109,7 +109,7 @@
<artifactId>jib-maven-plugin</artifactId>
<configuration>
<to>
<image>alvarosanchez/demo:${project.version}</image>
<image>alvarosanchez/${project.artifactId}:${project.version}</image>
</to>
</configuration>
</plugin>
Expand Down
2 changes: 1 addition & 1 deletion ...ker-native-oracle-function/src/test/java/io/micronaut/build/examples/ApplicationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import javax.inject.Inject;
import jakarta.inject.Inject;

@MicronautTest
public class ApplicationTest {
Expand Down
Loading
Loading