Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM maven:3.8.1-openjdk-17 AS build
WORKDIR /app
COPY pom.xml /app/
COPY src /app/src/
Run mvn clean package -DskipTests
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this should be RUN to make the case consistent with other keywords

FROM openjdk:17-jdk-slim
WORKDIR /app
COPY --from=build /app/target/rihal-0.0.1-SNAPSHOT.jar /app/rihal-0.0.1-SNAPSHOT.jar
EXPOSE 8080

ENTRYPOINT ["sh", "-c", "java -jar rihal-0.0.1-SNAPSHOT.jar"]
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there any benefit of running java through "sh" and not directly using ENTRYPOINT ["java", "-jar", "/app/your-application.jar"] ?

38 changes: 38 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
version: '3.8'

services:
db:
image: mysql:9.0.0
container_name: mysql
ports:
- "3307:3307"
networks:
- rihal
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: usersystem
MYSQL_PASSWORD: root
MYSQL_TCP_PORT: 3307
volumes:
- cont_db_data:/var/lib/mysql
restart: always
app:
build: .
container_name: java_app
ports:
- "8080:8080"
networks:
- rihal
environment:
SPRING_DATASOURCE_URL: jdbc:mysql://mysql:3307/usersystem?useSSL=false&serverTimezone=UTC&createDatabaseIfNotExist=true&allowPublicKeyRetrieval=true
SPRING_DATASOURCE_USERNAME: root
SPRING_DATASOURCE_PASSWORD: root
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should never push the password on GitHub.
Using the .env file can help solve this issues.

SPRING_JPA_HIBERNATE_DDL_AUTO: update
SPRING_JPA_SHOW_SQL: "true"
depends_on:
- db
restart: always
networks:
rihal: {} # Use default settings
volumes:
cont_db_data: {}
3 changes: 1 addition & 2 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
9 changes: 9 additions & 0 deletions target/classes/application.properties
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Target directory is meant for the machine the build is generated on. It should not be pushed to GitHub

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
spring.application.name=rihal
spring.datasource.url=${SPRING_DATASOURCE_URL}
spring.datasource.username=${SPRING_DATASOURCE_USERNAME}
spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL8Dialect
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver

17 changes: 17 additions & 0 deletions target/classes/templates/edit_user.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>Edit User</title>
</head>
<body>
<h1>Edit User</h1>
<form action="#" th:action="@{/users/{id}(id=${user.id})}" th:object="${user}" method="post">
<label>Name: </label>
<input type="text" th:field="*{name}" /><br>
<label>Email: </label>
<input type="email" th:field="*{email}" /><br>
<button type="submit">Save</button>
</form>
</body>
</html>
32 changes: 32 additions & 0 deletions target/classes/templates/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>User Management</title>
</head>
<body>
<h1>User Management</h1>
<a href="/users/new">Add New User</a>
<table>
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Email</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
<tr th:each="user : ${users}">
<td th:text="${user.id}"></td>
<td th:text="${user.name}"></td>
<td th:text="${user.email}"></td>
<td>
<a th:href="@{/users/edit/{id}(id=${user.id})}">Edit</a>
<a th:href="@{/users/delete/{id}(id=${user.id})}">Delete</a>
</td>
</tr>
</tbody>
</table>
</body>
</html>
17 changes: 17 additions & 0 deletions target/classes/templates/new_user.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>Add New User</title>
</head>
<body>
<h1>Add New User</h1>
<form action="#" th:action="@{/users}" th:object="${user}" method="post">
<label>Name: </label>
<input type="text" th:field="*{name}" /><br>
<label>Email: </label>
<input type="email" th:field="*{email}" /><br>
<button type="submit">Save</button>
</form>
</body>
</html>
3 changes: 3 additions & 0 deletions target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
artifactId=rihal
groupId=com.docker
version=0.0.1-SNAPSHOT
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
com\docker\rihal\repositories\UserRepository.class
com\docker\rihal\services\UserService.class
com\docker\rihal\controllers\UserController.class
com\docker\rihal\RihalApplication.class
com\docker\rihal\models\User.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
C:\Users\LjinaALMuharrami\UserInfoStoreApp\src\main\java\com\docker\rihal\controllers\UserController.java
C:\Users\LjinaALMuharrami\UserInfoStoreApp\src\main\java\com\docker\rihal\models\User.java
C:\Users\LjinaALMuharrami\UserInfoStoreApp\src\main\java\com\docker\rihal\repositories\UserRepository.java
C:\Users\LjinaALMuharrami\UserInfoStoreApp\src\main\java\com\docker\rihal\RihalApplication.java
C:\Users\LjinaALMuharrami\UserInfoStoreApp\src\main\java\com\docker\rihal\services\UserService.java
Binary file added target/rihal-0.0.1-SNAPSHOT.jar.original
Binary file not shown.