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 0000000..5c61340 Binary files /dev/null and b/target/rihal-0.0.1-SNAPSHOT.jar.original differ