diff --git a/Dockerfile b/Dockerfile index 7dc34b5..126f2bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,4 @@ -FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi -#FROM harbor-dev.alldcs.nl/allard/openliberty-java17 +FROM allardkrings/riscv64-liberty ARG VERSION=1.0 ARG REVISION=SNAPSHOT diff --git a/jffi b/jffi new file mode 160000 index 0000000..f2ccd60 --- /dev/null +++ b/jffi @@ -0,0 +1 @@ +Subproject commit f2ccd60d8ab52387d9bfcd46cc15349df7b77dbf diff --git a/pom-dockerfile.xml b/pom-dockerfile.xml new file mode 100755 index 0000000..ffcdeeb --- /dev/null +++ b/pom-dockerfile.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + 1.4.13 + hub.docker.com + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + com.spotify + dockerfile-maven-plugin + 1.4.13 + + + default + + build + + + + tag-latest + + tag + push + + + latest + + + + tag-version + + tag + + + ${project.version} + + + + + ${private.registry.url}/allardkrings/${project.artifactId} + latest + true + false + + + + + diff --git a/pom-fabric8.xml b/pom-fabric8.xml new file mode 100755 index 0000000..ab6614a --- /dev/null +++ b/pom-fabric8.xml @@ -0,0 +1,134 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + io.fabric8 + docker-maven-plugin + 0.44.0 + + //1 + + altshiftcreative/food-app-store-service + + + artifact + + + ${immersion} + + + + + + ${docker.hub.username} + ${docker.hub.password} + + + + + push + install + + stop + build + push + remove + + + + + + + diff --git a/pom-install.xml b/pom-install.xml new file mode 100755 index 0000000..dd7b42b --- /dev/null +++ b/pom-install.xml @@ -0,0 +1,99 @@ + + + 4.0.0 + + io.openliberty.guides + olproperties + 1.0 + war + + + 11 + 11 + UTF-8 + UTF-8 + + 9080 + 9443 + + + + + + jakarta.platform + jakarta.jakartaee-api + 10.0.0 + provided + + + org.eclipse.microprofile + microprofile + 6.0 + pom + provided + + + + org.junit.jupiter + junit-jupiter + 5.9.2 + test + + + org.jboss.resteasy + resteasy-client + 6.2.3.Final + test + + + org.jboss.resteasy + resteasy-json-binding-provider + 6.2.3.Final + test + + + org.glassfish + jakarta.json + 2.0.1 + test + + + + + ${project.artifactId} + + + + io.openliberty.tools + liberty-maven-plugin + 3.8.2 + + + org.apache.maven.plugins + maven-war-plugin + 3.3.2 + + + org.apache.maven.plugins + maven-surefire-plugin + 3.0.0 + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0 + + + ${liberty.var.default.http.port} + /dev + + + + + + + + diff --git a/pom.xml b/pom.xml index dd7b42b..09db0b9 100755 --- a/pom.xml +++ b/pom.xml @@ -4,14 +4,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - io.openliberty.guides - olproperties + allardkrings + riscv64-olproperties 1.0 war - 11 - 11 + 17 + 17 UTF-8 UTF-8 @@ -93,7 +93,69 @@ - + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + + docker-build + install + + exec + + + docker + ${project.basedir} + + build + -t + ${project.groupId}/${project.artifactId}:${project.version} + . + + + + + + docker-login + deploy + + exec + + + docker + ${project.basedir} + + login + -u + allardkrings + -p + Kubernetes01@ + hub.docker.io + + + + + docker-push + deploy + + exec + + + docker + ${project.basedir} + + push + ${project.groupId}/${project.artifactId}:${project.version} + + + + + diff --git a/target/olproperties.war b/target/olproperties.war index ab9e0e9..b5a44a4 100644 Binary files a/target/olproperties.war and b/target/olproperties.war differ