diff --git a/back-skeleton/docker-compose.yml b/back-skeleton/docker-compose.yml index a11c4317224ed0182981fcf2f45951b31e7fe441..1915a6783c4f1f5700eb9598adc2142232a3b385 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 d63e5302b76f69ae97195623daf5e7439bee2e5c..c1d2304bc511f28709d68dfaa3ebb3c0cd5903bd 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 831cf1252fa01417613f99b16b0c0101b6c3410b..1960ec60e2e13678f2f7f5c7a7b16881542a17ba 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 796f31519328f7fa6a2f448cffa67335b1a2809a..f1967bca154816419c07cd275d81dff407ae256f 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 0000000000000000000000000000000000000000..fa51bd1222e8582f6ce7ce4505355d904e98ea46 --- /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 8b137891791fe96927ad78e64b0aad7bded08bdc..fa51bd1222e8582f6ce7ce4505355d904e98ea46 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 Binary files a/back-skeleton/target/classes/com/takima/backskeleton/BackSkeletonApplication.class and b/back-skeleton/target/classes/com/takima/backskeleton/BackSkeletonApplication.class differ