Merge pull request #11 from RostyslavOnysh/configDocker

11-Configure-Docker
RostyslavOnysh · Oct 7, 2023 · 9890448 · 9890448
2 parents 8b64f9d + baa6c58
commit 9890448
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 24 deletions.
diff --git a/.env 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
diff --git a/Dockerfile 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
diff --git a/docker-compose.yaml 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?serverTimeZone=UTC",
+            "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"
diff --git a/pom.xml b/pom.xml
@@ -61,9 +61,9 @@
             <artifactId>lombok</artifactId>
         </dependency>
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.33</version>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <version>8.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.liquibase</groupId>
@@ -75,11 +75,6 @@
             <artifactId>liquibase-maven-plugin</artifactId>
             <version>${liquibase.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
             <artifactId>mapstruct</artifactId>
@@ -147,6 +142,10 @@
             <artifactId>javax.mail</artifactId>
             <version>1.6.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-docker-compose</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git 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
 

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
@@ -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."}