Skip to content

Commit 22a26a1

Browse files
sivaprasadreddysivaprasadreddy
committed
Updated docker config, git-commit-id plugin config.
1 parent f0fb495 commit 22a26a1

File tree

19 files changed

+112
-16
lines changed

19 files changed

+112
-16
lines changed

‎README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# spring-boot-microservices-series
2-
Code for SpringBoot MicroServices Blog Series
2+
Code for [SpringBoot MicroServices Blog Series](https://sivalabs.in/2018/03/microservices-using-springboot-spring-cloud-part-1-overview/)
33

44
## How to run?
55

@@ -9,15 +9,21 @@ Code for SpringBoot MicroServices Blog Series
99

1010
### Start infrastructure modules in docker:
1111

12-
`spring-boot-microservices-series> docker-compose up -d mysqldb rabbitmq setup-vault config-server service-registry hystrix-dashboard`
12+
**The simplest way to run all the services in Docker:**
13+
14+
`spring-boot-microservices-series> ./run.sh start_all`
15+
16+
**To start only infrastructure services (mysqldb, rabbitmq, config-server, service-registry, hystrix-dashboard) in docker:**
17+
18+
`spring-boot-microservices-series> ./run.sh start_infra`
1319

1420
**Start each microservice either in local or in docker:**
1521

1622
**Local:** `spring-boot-microservices-series/catalog-service> ./mvnw spring-boot:run`
1723

18-
**Docker:** `spring-boot-microservices-series> docker-compose up -d <service> --build --force-recreate`
24+
**Docker:** `spring-boot-microservices-series> ./run.sh start <service>`
1925

20-
Ex: `spring-boot-microservices-series> docker-compose up -d catalog-service --build --force-recreate`
26+
Ex: `spring-boot-microservices-series> ./run.sh start catalog-service`
2127

2228

2329
* MySQL container:

‎catalog-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/catalog-service-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8181 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎catalog-service/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,10 @@
129129
<plugin>
130130
<groupId>pl.project13.maven</groupId>
131131
<artifactId>git-commit-id-plugin</artifactId>
132+
<configuration>
133+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
134+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
135+
</configuration>
132136
</plugin>
133137
</plugins>
134138
</build>

‎config-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/config-server-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8888 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎config-server/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@
6868
<plugin>
6969
<groupId>pl.project13.maven</groupId>
7070
<artifactId>git-commit-id-plugin</artifactId>
71+
<configuration>
72+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
73+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
74+
</configuration>
7175
</plugin>
7276
</plugins>
7377
</build>

‎docker-compose.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ services:
1010
MYSQL_DATABASE: catalog
1111

1212
rabbitmq:
13+
image: 'rabbitmq:3.8.3-management'
1314
container_name: rabbitmq
14-
image: 'rabbitmq:management'
1515
environment:
1616
- RABBITMQ_DEFAULT_USER=guest
1717
- RABBITMQ_DEFAULT_PASS=guest
@@ -20,7 +20,7 @@ services:
2020
- "15672:15672"
2121

2222
vault:
23-
image: vault
23+
image: vault:1.4.0
2424
container_name: vault
2525
cap_add:
2626
- IPC_LOCK
@@ -30,7 +30,7 @@ services:
3030
- 8200:8200
3131

3232
setup-vault:
33-
image: vault
33+
image: vault:1.4.0
3434
container_name: setup-vault
3535
entrypoint: /bin/sh
3636
volumes:
@@ -47,7 +47,7 @@ services:
4747
- vault
4848

4949
zipkin-server:
50-
image: openzipkin/zipkin
50+
image: openzipkin/zipkin:2.21
5151
container_name: zipkin
5252
# Environment settings are defined here https://github.com/openzipkin/zipkin/tree/1.19.0/zipkin-server#environment-variables
5353
environment:
@@ -109,6 +109,7 @@ services:
109109
- "19797:8787"
110110
depends_on:
111111
- config-server
112+
- setup-vault
112113
- mysqldb
113114
entrypoint: /bin/sh
114115
command: >
@@ -124,6 +125,7 @@ services:
124125
- "29797:8787"
125126
depends_on:
126127
- config-server
128+
- setup-vault
127129
- mysqldb
128130
entrypoint: /bin/sh
129131
command: >
@@ -139,6 +141,7 @@ services:
139141
- "39797:8787"
140142
depends_on:
141143
- config-server
144+
- setup-vault
142145
entrypoint: /bin/sh
143146
command: >
144147
-c "
@@ -153,6 +156,7 @@ services:
153156
- "49797:8787"
154157
depends_on:
155158
- config-server
159+
- setup-vault
156160
entrypoint: /bin/sh
157161
command: >
158162
-c "

‎hystrix-dashboard/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/hystrix-dashboard-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8788 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎hystrix-dashboard/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@
9393
<plugin>
9494
<groupId>pl.project13.maven</groupId>
9595
<artifactId>git-commit-id-plugin</artifactId>
96+
<configuration>
97+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
98+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
99+
</configuration>
96100
</plugin>
97101
</plugins>
98102
</build>

‎inventory-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/inventory-service-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8282 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎inventory-service/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,10 @@
125125
<plugin>
126126
<groupId>pl.project13.maven</groupId>
127127
<artifactId>git-commit-id-plugin</artifactId>
128+
<configuration>
129+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
130+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
131+
</configuration>
128132
</plugin>
129133
</plugins>
130134
</build>

‎oauth2-server/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/oauth2-server-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8901 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎oauth2-server/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@
8989
<plugin>
9090
<groupId>pl.project13.maven</groupId>
9191
<artifactId>git-commit-id-plugin</artifactId>
92+
<configuration>
93+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
94+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
95+
</configuration>
9296
</plugin>
9397
</plugins>
9498
</build>

‎order-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/order-service-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8383 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎order-service/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
<plugin>
9898
<groupId>pl.project13.maven</groupId>
9999
<artifactId>git-commit-id-plugin</artifactId>
100+
<configuration>
101+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
102+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
103+
</configuration>
100104
</plugin>
101105
</plugins>
102106
</build>

‎run.sh

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/bin/bash
2+
3+
declare project_dir=$(dirname $0)
4+
declare dc_main=${project_dir}/docker-compose.yml
5+
6+
function restart() {
7+
stop_all
8+
start_all
9+
}
10+
11+
function start() {
12+
echo "Starting $1...."
13+
build_api
14+
docker-compose -f ${dc_main} up --build --force-recreate -d $1
15+
docker-compose -f ${dc_main} logs -f
16+
}
17+
18+
function stop() {
19+
echo "Stopping $1...."
20+
docker-compose -f ${dc_main} stop
21+
docker-compose -f ${dc_main} rm -f
22+
}
23+
24+
function start_infra() {
25+
echo "Starting mysqldb rabbitmq setup-vault config-server service-registry hystrix-dashboard...."
26+
docker-compose -f ${dc_main} up --build --force-recreate -d mysqldb rabbitmq setup-vault config-server service-registry hystrix-dashboard
27+
docker-compose -f ${dc_main} logs -f
28+
}
29+
30+
function start_all() {
31+
echo "Starting all services...."
32+
build_api
33+
docker-compose -f ${dc_main} up --build --force-recreate -d
34+
docker-compose -f ${dc_main} logs -f
35+
}
36+
37+
function stop_all() {
38+
echo 'Stopping all services....'
39+
docker-compose -f ${dc_main} stop
40+
docker-compose -f ${dc_main} rm -f
41+
}
42+
43+
function build_api() {
44+
./mvnw clean package -DskipTests
45+
}
46+
47+
action="start_all"
48+
49+
if [[ "$#" != "0" ]]
50+
then
51+
action=$@
52+
fi
53+
54+
eval ${action}

‎service-registry/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/service-registry-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8761 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎service-registry/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@
7171
<plugin>
7272
<groupId>pl.project13.maven</groupId>
7373
<artifactId>git-commit-id-plugin</artifactId>
74+
<configuration>
75+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
76+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
77+
</configuration>
7478
</plugin>
7579
</plugins>
7680
</build>

‎shoppingcart-ui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM frolvlad/alpine-java
1+
FROM fabric8/java-alpine-openjdk8-jre
22
ADD ["target/shoppingcart-ui-0.0.1-SNAPSHOT-exec.jar", "app.jar"]
33
EXPOSE 8080 8787
44
ENV JAVA_OPTS="-Xdebug -Xrunjdwp:server=y,transport=dt_socket,address=8787,suspend=n"

‎shoppingcart-ui/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@
9797
<plugin>
9898
<groupId>pl.project13.maven</groupId>
9999
<artifactId>git-commit-id-plugin</artifactId>
100+
<configuration>
101+
<failOnNoGitDirectory>false</failOnNoGitDirectory>
102+
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
103+
</configuration>
100104
</plugin>
101105
</plugins>
102106
</build>

0 commit comments

Comments
 (0)