Skip to content

Commit a48d914

Browse files
nixos89Nikola Stevanović
authored andcommitted
almost there...
1 parent 78f1144 commit a48d914

File tree

4 files changed

+30
-21
lines changed

4 files changed

+30
-21
lines changed

Dockerfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
FROM openjdk:8 as builder
2-
WORKDIR /usr/java-kotlin-rest-api
3-
COPY . .
1+
FROM openjdk:8
2+
#WORKDIR /usr/java-kotlin-rest-api
3+
ARG JAR_FILE=*.jar
4+
COPY build/libs/sb-kotlin-java-app-0.1.jar sb-kotlin-java-app-0.1.jar
45

5-
COPY ormconfig.docker.json ./ormconfig.json
6+
#COPY ormconfig.docker.json ./ormconfig.json
67

7-
EXPOSE 8080
8+
EXPOSE 8080 8081 5432 5440
89

910
ADD build/libs/sb-kotlin-java-app-0.1.jar sb-kotlin-java-app-0.1.jar
10-
ENTRYPOINT ["java", "-jar", "build/libs/sb-kotlin-java-app-0.1.jar"]
11+
ENTRYPOINT ["java", "-jar", "sb-kotlin-java-app-0.1.jar"]

docker-compose.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,36 @@
1-
version: "3.8"
1+
version: "3.7"
22
# https://github.com/docker-library/docs/blob/master/postgres/README.md
33
# https://github.com/docker-library/docs/tree/master/openjdk
44

55
services:
66
postgres-db:
77
image: postgres:12.9
88
volumes:
9-
- ./postgres-data:/var/lib/postgresql/data
9+
- "postgres-data:/var/lib/postgresql/data"
1010
environment:
1111
POSTGRES_USER: postgres
12-
POSTGRES_PASSWORD: postgres
12+
POSTGRES_PASSWORD: system
1313
POSTGRES_DB: todo_db
14+
# TODO: try mapping to different host and container ports
1415
ports:
1516
- "5440:5432"
17+
- "5441:5440"
1618
app:
1719
image: openjdk:8
20+
build:
21+
context: .
1822
depends_on:
1923
- postgres-db
2024
ports:
21-
- "8080:8080"
22-
working_dir: /first-java-kotlin-gradle-project
25+
- "8081:8080"
26+
- "8082:8080"
27+
# working_dir: /first-java-kotlin-gradle-project
2328
volumes:
24-
- ./build/lib/sb-kotlin-java-app-0.1.jar:/first-java-kotlin-gradle-project/
29+
- ./build/libs/:/first-java-kotlin-gradle-project/
2530
environment:
26-
POSTGRES_HOST: postgres
27-
POSTGRES_USER: postgres
28-
POSTGRES_DB: todo_db
31+
- SPRING_DATASOURCE_URL=jdbc:postgresql://db:5432/compose-postgres
32+
- SPRING_DATASOURCE_USERNAME=postgres
33+
- SPRING_DATASOURCE_PASSWORD=system
34+
- SPRING_JPA_HIBERNATE_DDL_AUTO=update
35+
volumes:
36+
postgres-data:

src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ management.endpoints.web.exposure.include=health,info,shutdown
44

55
spring.flyway.enabled=true
66
# setting up Postgres DB
7-
spring.datasource.url=jdbc:postgresql://localhost:5432/todo_db
7+
spring.datasource.url=jdbc:postgresql://localhost:5440/todo_db
88
spring.datasource.username=postgres
99
spring.datasource.password=postgres
1010
spring.datasource.driverClassName=org.postgresql.Driver
1111

12-
spring.flyway.url=jdbc:postgresql://localhost:5432/todo_db
12+
spring.flyway.url=jdbc:postgresql://localhost:5440/todo_db
1313
spring.flyway.driver-class-name=org.postgresql.Driver
1414
spring.flyway.schemas=public
1515
#spring.flyway.baseline-version=1

src/test/java/org/example/java_kotlin/FirstJavaKotlinGradleAppTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import org.junit.jupiter.api.Test;
55
import org.springframework.boot.test.context.SpringBootTest;
66

7-
@SpringBootTest
7+
//@SpringBootTest
88
public class FirstJavaKotlinGradleAppTest {
99

10-
@Test
11-
void contextLoads() {
12-
}
10+
// @Test
11+
// void contextLoads() {
12+
// }
1313

1414
}

0 commit comments

Comments
 (0)