From bf8981bb86d939807fe45870cee651fd75eb7f91 Mon Sep 17 00:00:00 2001
From: Bensidhoum Wissem <wbensidhoum@takima.fr>
Date: Mon, 22 Jan 2024 12:08:09 +0100
Subject: [PATCH] update docker compose file

---
 back-skeleton/docker-compose.yml                |  12 +++++++++++-
 back-skeleton/pom.xml                           |   1 +
 .../backskeleton/BackSkeletonApplication.java   |   1 +
 .../BackSkeletonApplicationTests.java           |   7 +++++--
 .../test/resources/application-test.properties  |   5 +++++
 .../target/classes/application.properties       |   6 +++++-
 .../backskeleton/BackSkeletonApplication.class  | Bin 771 -> 771 bytes
 7 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 back-skeleton/src/test/resources/application-test.properties

diff --git a/back-skeleton/docker-compose.yml b/back-skeleton/docker-compose.yml
index a11c431..1915a67 100644
--- a/back-skeleton/docker-compose.yml
+++ b/back-skeleton/docker-compose.yml
@@ -1,14 +1,24 @@
-version: '3.1'
+version: '3.9'
 services:
   database:
     container_name: api_database
     image: postgres
     restart: always
+    networks:
+      - db
     env_file:
       - .env
     environment:
       POSTGRES_USER : ${DATABASE_USER}
       POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
       POSTGRES_DB: ${DATABASE_NAME}
+    volumes:
+      - db-data:/var/lib/postgresql/data
+      - ./initdb:/docker-entrypoint-initdb.d:ro
     ports:
       - "5432:5432"
+
+networks:
+  db:
+volumes:
+  db-data:
\ No newline at end of file
diff --git a/back-skeleton/pom.xml b/back-skeleton/pom.xml
index d63e530..c1d2304 100644
--- a/back-skeleton/pom.xml
+++ b/back-skeleton/pom.xml
@@ -33,6 +33,7 @@
 			<artifactId>postgresql</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
diff --git a/back-skeleton/src/main/java/com/takima/backskeleton/BackSkeletonApplication.java b/back-skeleton/src/main/java/com/takima/backskeleton/BackSkeletonApplication.java
index 831cf12..1960ec6 100644
--- a/back-skeleton/src/main/java/com/takima/backskeleton/BackSkeletonApplication.java
+++ b/back-skeleton/src/main/java/com/takima/backskeleton/BackSkeletonApplication.java
@@ -7,6 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class BackSkeletonApplication {
 
 	public static void main(String[] args) {
+
 		SpringApplication.run(BackSkeletonApplication.class, args);
 	}
 
diff --git a/back-skeleton/src/test/java/com/takima/backskeleton/BackSkeletonApplicationTests.java b/back-skeleton/src/test/java/com/takima/backskeleton/BackSkeletonApplicationTests.java
index 796f315..f1967bc 100644
--- a/back-skeleton/src/test/java/com/takima/backskeleton/BackSkeletonApplicationTests.java
+++ b/back-skeleton/src/test/java/com/takima/backskeleton/BackSkeletonApplicationTests.java
@@ -2,12 +2,15 @@ package com.takima.backskeleton;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.ApplicationContext;
 
-@SpringBootTest
+import static org.assertj.core.api.Assertions.assertThat;
+@SpringBootTest()
 class BackSkeletonApplicationTests {
 
 	@Test
-	void contextLoads() {
+	void contextLoads(ApplicationContext context) {
+		assertThat(context).isNotNull();
 	}
 
 }
diff --git a/back-skeleton/src/test/resources/application-test.properties b/back-skeleton/src/test/resources/application-test.properties
new file mode 100644
index 0000000..fa51bd1
--- /dev/null
+++ b/back-skeleton/src/test/resources/application-test.properties
@@ -0,0 +1,5 @@
+spring.datasource.url=jdbc:postgresql://localhost:5432/${DATABASE_NAME}
+spring.datasource.username=${DATABASE_USER}
+spring.datasource.password=${DATABASE_PASSWORD}
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB
\ No newline at end of file
diff --git a/back-skeleton/target/classes/application.properties b/back-skeleton/target/classes/application.properties
index 8b13789..fa51bd1 100644
--- a/back-skeleton/target/classes/application.properties
+++ b/back-skeleton/target/classes/application.properties
@@ -1 +1,5 @@
-
+spring.datasource.url=jdbc:postgresql://localhost:5432/${DATABASE_NAME}
+spring.datasource.username=${DATABASE_USER}
+spring.datasource.password=${DATABASE_PASSWORD}
+spring.servlet.multipart.max-file-size=10MB
+spring.servlet.multipart.max-request-size=10MB
\ No newline at end of file
diff --git a/back-skeleton/target/classes/com/takima/backskeleton/BackSkeletonApplication.class b/back-skeleton/target/classes/com/takima/backskeleton/BackSkeletonApplication.class
index deea4b72b2a3d867c54a190601259fcc338d58d2..ad5f617ae03f147f82239a678afbe610d7c78f58 100644
GIT binary patch
delta 17
YcmZo>Yi8SUnu(R0ft`V8@&zVi04bydO8@`>

delta 17
YcmZo>Yi8SUnu(Q*ft`VS@&zVi04bIPNdN!<

-- 
GitLab