Skip to content

Commit

Permalink
fix: switch back to JVM
Browse files Browse the repository at this point in the history
  • Loading branch information
@bastiansmn
bastiansmn committed Nov 13, 2024
1 parent cad5983 commit 43e6408
Show file tree
Hide file tree
Showing 4 changed files with 103 additions and 92 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
run: uname -a

- name: Build with Maven
run: mvn -Pnative clean native:compile --file laponie-gouv-api/pom.xml
# run: mvn -B package --file laponie-gouv-api/pom.xml
# run: mvn -Pnative clean native:compile --file laponie-gouv-api/pom.xml
run: mvn -B package --file laponie-gouv-api/pom.xml

- name: Login and push to container registry
run: |
ls -lart laponie-gouv-api/target
echo ${{ secrets.REGISTRY_PASS }} | docker login registry.bastian-somon.fr --username ${{ secrets.REGISTRY_USER }} --password-stdin
docker buildx build -t registry.bastian-somon.fr/laponie-gouv-backend:latest --build-arg APP_FILE=laponie-gouv-api laponie-gouv-api
docker buildx build -t registry.bastian-somon.fr/laponie-gouv-backend:latest laponie-gouv-api -f Dockerfile.jvm
docker push registry.bastian-somon.fr/laponie-gouv-backend:latest
build-client:
Expand Down
7 changes: 7 additions & 0 deletions laponie-gouv-api/Dockerfile.jvm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM bitnami/java:21-debian-12

WORKDIR /app
COPY target/*.jar app.jar

ENTRYPOINT ["java", "-jar"]
CMD ["app.jar"]
176 changes: 90 additions & 86 deletions laponie-gouv-api/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.12</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>fr.bastiansmn</groupId>
<artifactId>laponie-gouv-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>laponie-gouv-api</name>
<description>Site officiel du gouvernement de Laponie</description>
<properties>
<java.version>17</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.0.13</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>fr.bastiansmn</groupId>
<artifactId>laponie-gouv-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>laponie-gouv-api</name>
<description>Site officiel du gouvernement de Laponie</description>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<properties>
<java.version>21</java.version>
<maven.compiler.source>21</maven.compiler.source>
<maven.compiler.target>21</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jdbc</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-mail</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Expand All @@ -86,20 +90,20 @@

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>

<plugin>
<groupId>org.graalvm.buildtools</groupId>
Expand All @@ -112,6 +116,6 @@
<version>8.5.13</version>
</plugin>
</plugins>
</build>
</build>

</project>
6 changes: 3 additions & 3 deletions laponie-gouv-api/src/main/java/fr/bastiansmn/laponiegouv/model/Family.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package fr.bastiansmn.laponiegouv.model;

import io.hypersistence.utils.hibernate.type.json.JsonType;
import io.hypersistence.utils.hibernate.type.json.JsonBinaryType;
import jakarta.persistence.*;
import lombok.Data;
import org.hibernate.annotations.Type;
Expand Down Expand Up @@ -35,8 +35,8 @@ public class Family {
)
private List<Kid> kids;

@Column(name = "draw", columnDefinition = "jsonb")
@Type(JsonType.class)
@Type(JsonBinaryType.class)
@Column(columnDefinition = "jsonb")
private Map<String, String> draw;

}

0 comments on commit 43e6408

Please sign in to comment.