From 4dcc8de65434757bbb3323446e8154e32c4ffc52 Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 16:01:26 +0100 Subject: [PATCH 1/6] deleted h2database dependency. And was added docker-compose dependency --- pom.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 1ede3bb..dd604c2 100644 --- a/pom.xml +++ b/pom.xml @@ -61,9 +61,9 @@ lombok - mysql - mysql-connector-java - 8.0.33 + com.mysql + mysql-connector-j + 8.1.0 org.liquibase @@ -75,11 +75,6 @@ liquibase-maven-plugin ${liquibase.version} - - com.h2database - h2 - test - org.mapstruct mapstruct @@ -147,6 +142,10 @@ javax.mail 1.6.2 + + org.springframework.boot + spring-boot-docker-compose + From 08bf75ee83bfb4c6c0e35d0d45fff00a914f5883 Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 16:01:53 +0100 Subject: [PATCH 2/6] Modified application.properties : password fields --- src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c8213b6..9de25c9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,6 +1,6 @@ spring.datasource.url=jdbc:mysql://localhost:3306/springDatabase?serverTimeZone=UTC spring.datasource.username=root -spring.datasource.password=13289812 +spring.datasource.password=${DB_PASSWORD} spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL57Dialect From 5ca8dc4af79d4c952767f1c7002c59d27e5f1c72 Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 16:02:04 +0100 Subject: [PATCH 3/6] was created Docker file --- Dockerfile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9087091 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,16 @@ +# Builder stage +FROM openjdk:17-jdk-slim as builder +WORKDIR application +ARG JAR_FILE=target/*.jar +COPY ${JAR_FILE} application.jar +RUN java -Djarmode=layertools -jar application.jar extract + +# Final stage +FROM openjdk:17-jdk-slim +WORKDIR application +COPY --from=builder application/dependencies/ ./ +COPY --from=builder application/spring-boot-loader/ ./ +COPY --from=builder application/snapshot-dependencies/ ./ +COPY --from=builder application/application/ ./ +ENTRYPOINT ["java", "org.springframework.boot.loader.JarLauncher"] +EXPOSE 8080 \ No newline at end of file From b5260d3ff5b86d64ce4bab0206c6c73bf8d8bab1 Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 16:02:21 +0100 Subject: [PATCH 4/6] created .env and docker-compose.yaml --- .env | 9 +++++++++ docker-compose.yaml | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .env create mode 100644 docker-compose.yaml diff --git a/.env b/.env new file mode 100644 index 0000000..427945f --- /dev/null +++ b/.env @@ -0,0 +1,9 @@ +MYSQLDB_USER=root +MYSQLDB_ROOT_PASSWORD=13289812 +MYSQLDB_DATABASE=springDatabase +MYSQL_LOCAL_PORT=3307 +MYSQL_DB_DOCKER_PORT=3306 + +SPRING_LOCAL_PORT=8088 +SPRING_DOCKER_PORT=8080 +DEBUG_PORT=5005 \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..df1dc50 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,32 @@ +version: '3.8' + +services: + mysql: + image: mysql:8.1.0 + restart: unless-stopped + env_file: + - ./.env + environment: + - MYSQL_DATABASE=$MYSQLDB_DATABASE + - MYSQL_ROOT_PASSWORD=$MYSQLDB_ROOT_PASSWORD + ports: + - $MYSQL_LOCAL_PORT:$MYSQL_DB_DOCKER_PORT + app: + depends_on: + - mysql + image: books-service + restart: unless-stopped + build: . + env_file: + - ./.env + ports: + - $SPRING_LOCAL_PORT:$SPRING_DOCKER_PORT + - $DEBUG_PORT:$DEBUG_PORT + environment: + SPRING_APPLICATION_JSON: '{ + "spring.datasource.url" : "jdbc:mysql://mysql:$MYSQL_DB_DOCKER_PORT/$MYSQLDB_DATABASE", + "spring.datasource.username" : "$MYSQLDB_USER", + "spring.datasource.password" : "$MYSQLDB_ROOT_PASSWORD", + "spring.jpa.hibernate.ddl-auto" : "validate" + }' + JAVA_TOOL_OPTIONS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005" From 070e98052ecfd93e34a89466c58aadd065625876 Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 19:11:06 +0100 Subject: [PATCH 5/6] generated new users with new values and password according to Bcrypt --- .../04-fill-users-table-with-data.yaml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/resources/db/changelog/changes/04-fill-users-table-with-data.yaml b/src/main/resources/db/changelog/changes/04-fill-users-table-with-data.yaml index ae73c1e..dda9b21 100644 --- a/src/main/resources/db/changelog/changes/04-fill-users-table-with-data.yaml +++ b/src/main/resources/db/changelog/changes/04-fill-users-table-with-data.yaml @@ -6,24 +6,24 @@ databaseChangeLog: - insert: tableName: users columns: - - column: {name: "email", value: "john1@gmail.com"} - - column: {name: "password", value: "$%^&*()DFGHJKL>dfghjkl$%^&*()DFGHJKL>dfghjkl"} # "111"} - - column: {name: "first_name", value: "John"} - - column: {name: "last_name", value: "alicovich"} - - column: {name: "shipping_address", value: "provulok bobd, cpo55"} + - column: {name: "email", value: "Tinsley.dev@gmail.com"} + - column: {name: "password", value: "$2a$13$y2CEFnRtr.sgE5Hk9EiBlu0CsJ9UN00U6P15.Ug6dyTDWp2wr6day"} + - column: {name: "first_name", value: "Tinsley"} + - column: {name: "last_name", value: "Carpenter"} + - column: {name: "shipping_address", value: "Old Youghal Rd."} - insert: tableName: users columns: - - column: {name: "email", value: "alice35@gmail.com"} - - column: {name: "password", value: "DFGHJKL:#$%^&*()34567890SDFGHJKLdfghjk0SDFGHJKLdfghjk"} # "222"} - - column: {name: "first_name", value: "alice"} - - column: {name: "last_name", value: "bobovich"} - - column: {name: "shipping_address", value: "provulok alice, jkE33"} + - column: {name: "email", value: "Emelia.dev@gmail.com"} + - column: {name: "password", value: "$2a$13$KX30WwnbCLf2HtMWTvHe8u50zUvIOjN/98PGTQnp4fZkyhSDYgf6e"} + - column: {name: "first_name", value: "Emelia"} + - column: {name: "last_name", value: "Robbins"} + - column: {name: "shipping_address", value: "Barnalyra Charlestown"} - insert: tableName: users columns: - - column: {name: "email", value: "bob2@gmail.com"} - - column: {name: "password", value: "lkjftFHHJJNBVDD$%^*IHBHGCGF3"} # "333"} - - column: {name: "first_name", value: "bob"} - - column: {name: "last_name", value: "alison"} - - column: {name: "shipping_address", value: "provulok boba, sH12"} + - column: {name: "email", value: "Zyair.dev@gmail.com"} + - column: {name: "password", value: "$2a$13$01NgDFQR0rU/UifonegSJOTGx7p53nW/ScCch2IyYycEDegJRerVS"} + - column: {name: "first_name", value: "Zyair"} + - column: {name: "last_name", value: "Rush"} + - column: {name: "shipping_address", value: "30c Kearns Pl."} From baa6c5877e445e1dd516d0e6f0ee0f88820fdeed Mon Sep 17 00:00:00 2001 From: Ros Date: Fri, 6 Oct 2023 19:11:20 +0100 Subject: [PATCH 6/6] was added server time zone --- docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index df1dc50..1c41266 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -24,7 +24,7 @@ services: - $DEBUG_PORT:$DEBUG_PORT environment: SPRING_APPLICATION_JSON: '{ - "spring.datasource.url" : "jdbc:mysql://mysql:$MYSQL_DB_DOCKER_PORT/$MYSQLDB_DATABASE", + "spring.datasource.url" : "jdbc:mysql://mysql:$MYSQL_DB_DOCKER_PORT/$MYSQLDB_DATABASE?serverTimeZone=UTC", "spring.datasource.username" : "$MYSQLDB_USER", "spring.datasource.password" : "$MYSQLDB_ROOT_PASSWORD", "spring.jpa.hibernate.ddl-auto" : "validate"