From 9af3ed66ecdc5cfb1ec0e05db170465ee9a0d924 Mon Sep 17 00:00:00 2001 From: Ljina AL Muharrami Date: Tue, 30 Jul 2024 22:05:26 +0400 Subject: [PATCH] Added dockerfile and docker-compose --- Dockerfile | 11 +++++ docker-compose.yml | 38 ++++++++++++++++++ src/main/resources/application.properties | 3 +- target/classes/application.properties | 9 +++++ target/classes/templates/edit_user.html | 17 ++++++++ target/classes/templates/index.html | 32 +++++++++++++++ target/classes/templates/new_user.html | 17 ++++++++ target/maven-archiver/pom.properties | 3 ++ .../compile/default-compile/createdFiles.lst | 5 +++ .../compile/default-compile/inputFiles.lst | 5 +++ target/rihal-0.0.1-SNAPSHOT.jar.original | Bin 0 -> 8396 bytes 11 files changed, 138 insertions(+), 2 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml create mode 100644 target/classes/application.properties create mode 100644 target/classes/templates/edit_user.html create mode 100644 target/classes/templates/index.html create mode 100644 target/classes/templates/new_user.html create mode 100644 target/maven-archiver/pom.properties create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst create mode 100644 target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst create mode 100644 target/rihal-0.0.1-SNAPSHOT.jar.original diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b9aaf05 --- /dev/null +++ b/Dockerfile @@ -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 +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"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..2f7d390 --- /dev/null +++ b/docker-compose.yml @@ -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 + 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: {} \ No newline at end of file diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 9cc6243..4023477 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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 \ No newline at end of file diff --git a/target/classes/application.properties b/target/classes/application.properties new file mode 100644 index 0000000..9cc6243 --- /dev/null +++ b/target/classes/application.properties @@ -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 + diff --git a/target/classes/templates/edit_user.html b/target/classes/templates/edit_user.html new file mode 100644 index 0000000..8346537 --- /dev/null +++ b/target/classes/templates/edit_user.html @@ -0,0 +1,17 @@ + + + + + Edit User + + +

Edit User

+
+ +
+ +
+ +
+ + diff --git a/target/classes/templates/index.html b/target/classes/templates/index.html new file mode 100644 index 0000000..437d263 --- /dev/null +++ b/target/classes/templates/index.html @@ -0,0 +1,32 @@ + + + + + User Management + + +

User Management

+Add New User + + + + + + + + + + + + + + + + + +
IDNameEmailActions
+ Edit + Delete +
+ + diff --git a/target/classes/templates/new_user.html b/target/classes/templates/new_user.html new file mode 100644 index 0000000..14e04e3 --- /dev/null +++ b/target/classes/templates/new_user.html @@ -0,0 +1,17 @@ + + + + + Add New User + + +

Add New User

+
+ +
+ +
+ +
+ + diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties new file mode 100644 index 0000000..c66596b --- /dev/null +++ b/target/maven-archiver/pom.properties @@ -0,0 +1,3 @@ +artifactId=rihal +groupId=com.docker +version=0.0.1-SNAPSHOT diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..6ea471a --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -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 diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..4348445 --- /dev/null +++ b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -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 diff --git a/target/rihal-0.0.1-SNAPSHOT.jar.original b/target/rihal-0.0.1-SNAPSHOT.jar.original new file mode 100644 index 0000000000000000000000000000000000000000..5c61340c516df11f74c52b0825c46aada5a7f9bf GIT binary patch literal 8396 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 literal 0 HcmV?d00001