Merge pull request #153 from conorheffron/docker-up

Docker compose up

Author: conorheffron

Dockerfile

@@ -1,7 +1,10 @@
 FROM eclipse-temurin:21-jdk
 
 VOLUME /tmp
+# for CI
 ADD *.war app.war
+# for local
+#ADD build/libs/*.war app.war
 RUN sh -c 'touch /app.war'
 
 ENTRYPOINT [ "sh", "-c", "java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /app.war" ]

README.md

@@ -15,7 +15,7 @@ This project is a sample data manager. It provides a basic template for Java/Spr
 Users can view, add, delete person objects from the database via web UI.
 
 ## Technologies Used
-Java 21 (LTS Version), Spring Boot 3, Hibernate, MySQL, JSP, Gradle 8
+Java 21 (LTS Version), Spring Boot 3, Hibernate, MySQL, JSP, Gradle 8.5
 
 ## Run
 MySql
@@ -30,26 +30,54 @@ docker inspect test-mysql
 ![load-db](./screenshots/run-starter-db-script.png?raw=true "Load DB")
 ![verify-db](./screenshots/verify-db-load.png?raw=true "Verify DB")
 
+## Create Network
+```
+docker network create my-network
+docker inspect network my-network 
+```
+
+## Link container to same network for access:
+```
+docker network connect test-mysql
+```
+
+## Inspect network configurations & update application properties with IPv4Address instead of localhost if mac user (IPv4Address for my-sql etc.)
 - Get IP address from inspect cmd and test connection from MySql workbench with new host IP. Run StarterDb.sql.
+```
+docker inspect network my-network 
+```
+
+## Build ironoc-db, run unit & integration tests, & generate war file.
+```
+gradle build
+```
 
-Run 'com.ironoc.db.App.java' directly from IntelliJ or via CLI (build / spin up docker image):
+## Run 'com.ironoc.db.App.java' directly from IntelliJ (can use localhost for spring.datasource.url) or via CLI (build & spin up docker image, use docker network IP address for test-mysql process):
 ```
-docker compose up
+docker image build -t ironoc-db .
+docker compose up -d
 ```
+![docker-cli](./screenshots/CLI-docker.png?raw=true "CLI Docker")
 
 ## Tear-down:
 ```
 docker stop test-mysql
 docker remove test-mysql
 ```
 
+## Alternatively, Docker Desktop is good if you prefer to not use the terminal/command line (CLI)
+![docker-desktop-containers](./screenshots/docker-desktop-containers.png?raw=true "Docker Desktop containers")
+
+## Can tail the logs by scrolling within the container logs:
+![docker-desktop-ironoc-db-logs](./screenshots/docker-desktop-ironoc-db-logs.png?raw=true "Docker Desktop ironoc-db logs")
+
 ## Screenshot Home
 ![Home](./screenshots/DBManager.png?raw=true "Home Page")
 
 ## Screenshot Form Validation Error for Add Person Call
-![image](https://github.com/user-attachments/assets/3b5edddb-4b6e-40a4-bbb5-99f5367bccad)
+![ui-form-validation](./screenshots/ui-form-validation.png?raw=true "UI form validation")
 
 ## Screenshot Form Validation Error for Delete Operation
-![image](https://github.com/user-attachments/assets/d4086af9-02a1-467e-9a75-93c507c7966d)
+![ui-delete-validation](./screenshots/ui-delete-validation.png?raw=true "UI delete validation")
 
 

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version   | Supported          |
 |-----------| ------------------ |
-| 4.2.14    | :white_check_mark: |
-| <= 4.2.13 | :x: |
+| 4.2.15    | :white_check_mark: |
+| <= 4.2.14 | :x: |
 | 3.x.x     | :x:                |
 
 ## Reporting a Vulnerability

build.gradle

@@ -7,13 +7,17 @@ buildscript {
     }
 }
 
-apply plugin: 'java'
+plugins {
+    id 'java'
+    id 'org.springframework.boot' version '3.3.1'
+}
+
 apply plugin: 'eclipse'
 apply plugin: 'idea'
 apply plugin: 'war'
 
 group = 'conorheffron'
-version = '4.2.14'
+version = '4.2.15'
 description = "Sample Data Manager"
 
 sourceCompatibility = 21

docker-compose.yml

@@ -1,8 +1,13 @@
-version: '3'
 services:
   web:
-    image: "conorheffron/ironoc-db:1.5.4"
+    image: "ironoc-db"
     ports:
      - "8080:8080"
+    networks:
+      - my-network
     volumes:
-     - .:/tmp
+     - .:/tmp
+
+networks:
+  my-network:
+    external: true

screenshots/CLI-docker.png

@@ -16,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.view.RedirectView;
-
 import java.util.List;
 
 @Controller

screenshots/docker-desktop-containers.png

@@ -1,4 +1,7 @@
 # Data Source
+# docker run
+#spring.datasource.url=jdbc:mysql://172.19.0.2:3306/test?autoReconnect=true&useSSL=false
+# Intellij run
 spring.datasource.url=jdbc:mysql://localhost:3306/test?autoReconnect=true&useSSL=false
 spring.datasource.username=root
 spring.datasource.password=mypassword