Skip to content

Commit be36577

Browse files
authored
Merge pull request #71 from conorheffron/dev
v2.3.0
2 parents 1583b53 + 5f1654c commit be36577

File tree

2 files changed

+23
-20
lines changed

2 files changed

+23
-20
lines changed

README.md

+16-13
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
Sample Data Manager
1+
# Sample Data Manager
22
================
33

4-
# Docker Hub
4+
## Docker Hub
55
[ironoc-db docker hub](https://hub.docker.com/repository/docker/conorheffron/ironoc-db/general)
66

7-
# Summary
7+
## Summary
88
This project is a sample data manager. It provides a basic template for Java/Spring developers. This project also includes form validation of controller model objects and request parameters.
99
Users can view, add, delete person objects from the database via web UI.
10-
# Technologies
10+
11+
## Technologies Used
1112
Java 8, Spring Boot, Hibernate, MySQL, JSP, Gradle
1213

13-
# Run
14+
## Run
1415
MySql
1516
```
1617
docker run -p 3306:3306 -d --name test-mysql -e "MYSQL_ROOT_PASSWORD=mypassword" mysql
@@ -23,34 +24,36 @@ docker inspect test-mysql
2324
![load-db](./screenshots/run-starter-db-script.png?raw=true "Load DB")
2425
![verify-db](./screenshots/verify-db-load.png?raw=true "Verify DB")
2526

26-
Get IP address from inspect cmd and test connection from MySql workbench with new host IP. Run StarterDb.sql.
27+
- Get IP address from inspect cmd and test connection from MySql workbench with new host IP. Run StarterDb.sql.
2728

28-
Build Image:
29+
## Build Image:
2930
```
3031
gradle clean buildDocker
3132
```
3233

33-
Spin-up Container:
34+
## Spin-up Container:
3435
```
3536
docker run -d -p 8080:8080 --name ironocdb conorheffron/ironoc-db:1.5.3
3637
```
3738

38-
Create Network
39+
## Create Network
3940
```
4041
docker network create my-network
4142
docker inspect network my-network
4243
```
43-
Link containers to same network for access:
44+
45+
## Link containers to same network for access:
4446
```
4547
docker network connect test-mysql
4648
docker network connect ironocdb
4749
```
48-
Inspect network configurations (IPv4Address etc.)
50+
51+
## Inspect network configurations (IPv4Address etc.)
4952
```
5053
docker inspect network my-network
5154
```
5255

53-
Tear-down:
56+
## Tear-down:
5457
```
5558
docker stop ironocdb
5659
docker remove ironocdb
@@ -60,5 +63,5 @@ docker stop test-mysql
6063
docker remove test-mysql
6164
```
6265

63-
# Screenshots
66+
## Screenshot Home
6467
![Home](./screenshots/DBManager.png?raw=true "Home Page")

build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ apply plugin: 'idea'
1414
apply plugin: 'org.springframework.boot'
1515
apply plugin: 'docker'
1616
apply plugin: 'war'
17-
// apply plugin: 'maven'
17+
apply plugin: 'maven'
1818

1919
group = 'conorheffron'
20-
version = '1.5.3'
20+
version = '2.3.0'
2121
description = "Sample Data Manager"
2222

2323
sourceCompatibility = 1.8
@@ -35,21 +35,21 @@ dependencies {
3535
compile group: 'com.rabbitmq', name: 'amqp-client', version:'5.20.0'
3636
compile group: 'io.searchbox', name: 'jest', version:'6.3.1'
3737
compile group: 'org.elasticsearch', name: 'elasticsearch', version:'8.13.0'
38-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'1.5.6.RELEASE'
39-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:'1.5.6.RELEASE'
38+
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version:'1.5.22.RELEASE'
39+
compile group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa', version:'1.5.22.RELEASE'
4040
compile group: 'mysql', name: 'mysql-connector-java', version:'8.0.33'
4141
compile group: 'com.sparkpost', name: 'sparkpost-lib', version:'0.27'
42-
compile group: 'com.h2database', name: 'h2', version:'1.4.196'
42+
compile group: 'com.h2database', name: 'h2', version:'2.2.224'
4343
compile group: 'org.apache.maven.reporting', name: 'maven-reporting-api', version:'3.1.1'
4444
compile group: 'org.jacoco', name: 'jacoco-maven-plugin', version:'0.8.11'
4545

46-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version:'3.2.4'
46+
compile group: 'org.springframework.boot', name: 'spring-boot-starter-tomcat', version:'1.5.22.RELEASE'
4747
compile group: 'org.apache.tomcat.embed', name: 'tomcat-embed-jasper', version:'10.1.20'
4848
// compile group: 'javax.servlet', name: 'jstl', version:'1.2'
4949
compile group: 'javax.servlet', name: 'servlet-api', version: '2.5'
5050

5151
testImplementation group: 'junit', name: 'junit', version: '4.13.2'
52-
testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'3.2.4') {
52+
testCompile(group: 'org.springframework.boot', name: 'spring-boot-starter-test', version:'1.5.22.RELEASE') {
5353
exclude(module: 'commons-logging')
5454
}
5555
}

0 commit comments

Comments
 (0)