Skip to content

Commit 6d8b126

Browse files
committed
update README
1 parent e32d16e commit 6d8b126

24 files changed

+133
-103
lines changed

.travis.yml

+38-37
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ script:
2929
- bash ./gradlew >/dev/null 2>&1
3030
- bash ./gradlew composeUp >/dev/null 2>&1
3131
- http :8080/app/
32-
- bash ./gradlew composeDown >/dev/null 2>&1
32+
- bash ./gradlew composeDown
3333
# faces maven
3434
- bash ./mvnw >/dev/null 2>&1
3535
- bash ./mvnw clean package com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up >/dev/null 2>&1
36-
- docker logs -f faces_maven-faces-app_1 &
36+
- docker logs -f springfaces_maven-spring-faces-app_1 &
3737
- sleep 40
3838
- http :8080/app/
3939
- bash ./mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:down >/dev/null 2>&1
@@ -96,43 +96,44 @@ script:
9696
--httpPort=8080 \
9797
--httpContext=/ &
9898
- bash mvnw >/dev/null 2>&1
99-
- bash gradlew >/dev/null 2>&1
100-
- bash build/libs/*.jar -Djava.net.preferIPv4Stack=true &
99+
- bash gradlew
100+
- bash build/libs/*-swarm.jar -Djava.net.preferIPv4Stack=true &
101101
- wait_for 8080
102102
- sleep 15
103103
- http :8080/kafka/query
104104
- http :8080/kafka/produce
105105
- http :8080/kafka/produce
106106
- stop_any 8080 8080 9092 2181
107107
- sudo killall -9 java
108+
108109
# kotlin-swarm
109110
- cd ${parent}/kotlin-swarm
110111
- bash mvnw >/dev/null 2>&1
111112
#- sudo bash mvnw wildfly-swarm:run &
112113
#- java -jar target/*.jar &
113114
- bash gradlew >/dev/null 2>&1
114-
- bash build/libs/*.jar -Djava.net.preferIPv4Stack=true &
115+
- bash build/libs/*-swarm.jar -Djava.net.preferIPv4Stack=true &
115116
- wait_for 8080
116117
- sleep 5
117118
- http :8080
118119
- http :8080/health
119120
- stop_any 8080
120-
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up
121+
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:up >/dev/null 2>&1
121122
- sleep 25
122123
- http :8080
123124
- http :8080/health
124-
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:down
125-
- bash gradlew composeUp || true
125+
- bash mvnw com.dkanejs.maven.plugins:docker-compose-maven-plugin:1.0.1:down >/dev/null 2>&1
126+
- bash gradlew composeUp >/dev/null 2>&1 || true
126127
- sleep 25
127128
- http :8080
128129
- http :8080/health
129-
- bash gradlew composeDown || true
130-
- docker-compose -f docker-compose-maven.yaml build
131-
- docker-compose -f docker-compose-maven.yaml up &
130+
- bash gradlew composeDown >/dev/null 2>&1 || true
131+
- docker-compose -f docker-compose-maven.yaml build >/dev/null 2>&1
132+
- docker-compose -f docker-compose-maven.yaml up & >/dev/null 2>&1
132133
- sleep 40
133134
- http :8080
134135
- http :8080/health
135-
- docker-compose -f docker-compose-maven.yaml down -v
136+
- docker-compose -f docker-compose-maven.yaml down -v >/dev/null 2>&1
136137

137138
## kotlin-javaee-cdi-h2
138139
#- cd ${parent}/kotlin-javaee-cdi-h2
@@ -170,8 +171,8 @@ script:
170171
; do
171172
172173
cd ${parent}/${path}
173-
bash mvnw
174-
docker-compose build --force-rm --no-cache --pull
174+
bash mvnw >/dev/null 2>&1
175+
docker-compose build --force-rm --no-cache --pull >/dev/null 2>&1
175176
docker-compose up --force-recreate --remove-orphans &
176177
sleep 20
177178
http post :8080/client/update/max
@@ -180,14 +181,14 @@ script:
180181
http :8080/client/
181182
http post :8080/client/update/max\?remove=true
182183
http :8080/client/
183-
docker-compose down -v
184+
docker-compose down -v >/dev/null 2>&1
184185
185186
done;
186187
187188
# ejb-stateful-singleton
188189
- cd ${parent}/ejb-stateful-singleton
189-
- bash mvnw
190-
- docker-compose build --force-rm --no-cache --pull
190+
- bash mvnw >/dev/null 2>&1
191+
- docker-compose build --force-rm --no-cache --pull >/dev/null 2>&1
191192
- docker-compose up --force-recreate --remove-orphans &
192193
- sleep 20
193194
- http :8080/client/
@@ -200,7 +201,7 @@ script:
200201
- http post :8080/client/counter/incr
201202
- http :8080/client/get\?key=EJB
202203
- http post :8080/client/reset
203-
- docker-compose down -v
204+
- docker-compose down -v >/dev/null 2>&1
204205

205206
## ejb-3-starter
206207
#- cd ${parent}/ejb-3-starter
@@ -301,12 +302,12 @@ script:
301302
; do
302303
303304
cd ${parent}/${path}
304-
bash mvnw clean package -U -T 4
305-
docker-compose build --force-rm --no-cache --pull
306-
docker-compose up --force-recreate --remove-orphans &
305+
bash mvnw clean package -U -T 4 >/dev/null 2>&1
306+
docker-compose build --force-rm --no-cache --pull >/dev/null 2>&1
307+
docker-compose up --force-recreate --remove-orphans & >/dev/null 2>&1
307308
sleep 30
308309
http :8080/client/v1/greet/Max
309-
docker-compose down -v
310+
docker-compose down -v >/dev/null 2>&1
310311
done
311312
312313
# tomee-ext.js, glassfish-ext.js
@@ -317,13 +318,13 @@ script:
317318
; do
318319
319320
cd ${parent}/${path}
320-
bash mvnw clean package -U -T 4
321+
bash mvnw clean package -U -T 4 >/dev/null 2>&1
321322
stop_any 8080
322-
docker-compose up -d --build --force-recreate --remove-orphans
323+
docker-compose up -d --build --force-recreate --remove-orphans >/dev/null 2>&1
323324
sleep 30
324325
http :8080/ui/
325326
http :8080/rest-api/health
326-
docker-compose down -v
327+
docker-compose down -v >/dev/null 2>&1
327328
328329
done
329330
@@ -339,15 +340,15 @@ script:
339340

340341
# forge-ws
341342
- cd ${parent}/forge-ws
342-
- bash mvnw clean package -U
343-
- bash gradlew clean build
344-
- docker-compose up --build --force-recreate --remove-orphans -d
343+
- bash mvnw clean package -U >/dev/null 2>&1
344+
- bash gradlew clean build >/dev/null 2>&1
345+
- docker-compose up --build --force-recreate --remove-orphans -d >/dev/null 2>&1
345346
- sleep 20
346347
- http :8080/app/v1/api
347348
- http ":8080/app/UserService?wsdl"
348349
- curl -XPOST http://localhost:8080/app/User --header "content-type:text/xml" -d @./src/test/resources/empty-request.xml | xmllint --format -
349350
- curl -XPOST http://localhost:8080/app/User --header "content-type:text/xml" -d @src/test/resources/named-request.xml | xmllint --format -
350-
- docker-compose down -v
351+
- docker-compose down -v >/dev/null 2>&1
351352

352353
## java-ee-7-docker-jboss-eap-6.4-quickstart
353354
#- cd ${parent}/java-ee-7-docker-jboss-eap-6.4-quickstart
@@ -359,7 +360,7 @@ script:
359360

360361
# kumuluzee-mp-2.0-jax-ws
361362
- cd ${parent}/kumuluzee-mp-2.0-jax-ws
362-
- bash mvnw clean package
363+
- bash mvnw clean package >/dev/null 2>&1
363364
- java -jar ./target/*.jar &
364365
- wait_for 8000
365366
- sleep 3
@@ -368,7 +369,7 @@ script:
368369
- http :8000/api/v1/ws\?wsdl
369370
- curl -XPOST http://localhost:8000/api/v1/ws --header "content-type:text/xml" -d @./request.xml | xmllint --format -
370371
- stop_any 8000
371-
- docker-compose build --force-rm --no-cache --pull
372+
- docker-compose build --force-rm --no-cache --pull >/dev/null 2>&1
372373
- docker-compose up --force-recreate --remove-orphans &
373374
- sleep 35
374375
- curl -sS localhost:8000 | jq
@@ -378,7 +379,7 @@ script:
378379
- curl -XPOST http://localhost:8000/api/v1/ws --header "content-type:text/xml" -d @./request.xml | xmllint --format - | grep id
379380
- curl -XPOST http://localhost:8000/api/v1/ws --header "content-type:text/xml" -d @./request.xml | xmllint --format - | grep id
380381
- curl -XPOST http://localhost:8000/api/v1/ws --header "content-type:text/xml" -d @./request.xml | xmllint --format - | grep id
381-
- docker-compose down -v
382+
- docker-compose down -v >/dev/null 2>&1
382383

383384
## kumuluzee-microprofile-1.0
384385
#- cd ${parent}/kumuluzee-microprofile-1.0
@@ -390,13 +391,13 @@ script:
390391

391392
# jboss-eap-ext.js
392393
- cd ${parent}/jboss-eap-ext.js
393-
- bash mvnw clean package -U -T 4
394+
- bash mvnw clean package -U -T 4 >/dev/null 2>&1
395+
- docker-compose up -d --build --force-recreate --remove-orphans >/dev/null 2>&1
394396
- stop_any 8080
395-
- docker-compose up -d --build --force-recreate --remove-orphans
396397
- sleep 30
397398
- http :8080/ui/
398399
- http :8080/rest-api/health
399-
- docker-compose down -v
400+
- docker-compose down -v >/dev/null 2>&1
400401

401402
## kotlin-java-ee-payara-docker
402403
#- cd ${parent}/kotlin-java-ee-payara-docker
@@ -440,7 +441,7 @@ script:
440441

441442
# kotlin-java-ee
442443
- cd ${parent}/kotlin-java-ee
443-
- bash gradlew clean build
444+
- bash gradlew clean build >/dev/null 2>&1
444445
- java -Djava.net.preferIPv4Stack=true -jar build/libs/*-swarm.jar &
445446
- sleep 30
446447
- http :8080
@@ -461,4 +462,4 @@ script:
461462
bash docker/bin/test-docker-compose.bash
462463
# sometimes docker swarm for some reasons not working here as 2nd, 3rd, ...
463464
bash docker/bin/test-stack-deploy.bash
464-
bash gradlew clean build wildfly-swarm-package
465+
bash gradlew clean build wildfly-swarm-package >/dev/null 2>&1

docs/build.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,5 @@ task wrapper(type: Wrapper) {
6464
gradleVersion = "4.6"
6565
distributionType = "ALL"
6666
}
67+
68+
defaultTasks "clean", "asciidoctor"

glassfish-ext.js/Dockerfile

+1-34
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,2 @@
1-
FROM openjdk:8u151-jdk-alpine
2-
MAINTAINER Maksim Kostromin https://github.com/daggerok/docker
3-
4-
ARG GLASSFISH_USER="glassfish5"
5-
#ARG GLASSFISH_FILE_ARG="glassfish-5.0.zip"
6-
ARG GLASSFISH_FILE_ARG="glassfish-5.0-web.zip"
7-
ENV GLASSFISH_FILE=${GLASSFISH_FILE_ARG}
8-
ENV GLASSFISH_USER_HOME="/home/${GLASSFISH_USER}"
9-
ENV GLASSFISH_HOME="${GLASSFISH_USER_HOME}/${GLASSFISH_USER}"
10-
ENV GLASSFISH_URL="http://download.oracle.com/glassfish/5.0/release/${GLASSFISH_FILE}"
11-
12-
RUN apk --no-cache --update add busybox-suid bash wget ca-certificates unzip \
13-
&& rm -rf /var/cache/apk/* \
14-
&& addgroup ${GLASSFISH_USER}-group \
15-
&& adduser -h ${GLASSFISH_USER_HOME} -s /bin/bash -D -u 1025 ${GLASSFISH_USER} ${GLASSFISH_USER}-group
16-
USER ${GLASSFISH_USER}
17-
WORKDIR ${GLASSFISH_USER_HOME}
18-
19-
CMD /bin/bash
20-
EXPOSE 8080
21-
ENTRYPOINT /bin/bash ${GLASSFISH_HOME}/bin/asadmin restart-domain domain1 \
22-
&& tail -f ${GLASSFISH_HOME}/glassfish/domains/domain1/logs/server.log
23-
24-
RUN wget ${GLASSFISH_URL} -O ${GLASSFISH_USER_HOME}/${GLASSFISH_FILE} \
25-
&& unzip ${GLASSFISH_USER_HOME}/${GLASSFISH_FILE} -d ${GLASSFISH_USER_HOME} \
26-
&& rm -rf ${GLASSFISH_USER_HOME}/${GLASSFISH_FILE}
27-
28-
# check all apps healthy
29-
HEALTHCHECK --interval=1s --timeout=3s --retries=30 \
30-
CMD wget -q --spider http://127.0.0.1:8080/rest-api/health \
31-
&& wget -q --spider http://127.0.0.1:8080/ui/ \
32-
|| exit 1
33-
34-
# deploy apps
1+
FROM daggerok/glassfish:5.0
352
COPY ./rest-api/target/*.war ./ui/target/*.war ${GLASSFISH_HOME}/glassfish/domains/domain1/autodeploy/

glassfish-ext.js/README.adoc

+2-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ packaging two WARs in glassfish in Docker
88
.Using Glassfish 5.0 in docker (alpine)
99
----
1010
./mvnw clean package -U -T 2
11-
docker-compose up --build
12-
13-
open localhost:8080/ui/
14-
11+
docker-compose up --build --force-recreate --remove-orphans
12+
http :8080/ui/
1513
docker-compose down -v
1614
----
1715

glassfish-ext.js/docker-compose.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ version: "2.1"
33
services:
44

55
glassfish-extjs:
6-
restart: unless-stopped
76
build: .
87
volumes: ["glassfish-extjs-data:/home"]
98
ports:
10-
- "8080:8080"
11-
- "9990:9990"
9+
- "8080:8080"
10+
- "9990:9990"
1211
networks: [backing-services]
12+
#restart: unless-stopped
1313

1414
volumes:
1515
glassfish-extjs-data: {}

glassfish-ext.js/pom.xml

+3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
5+
56
<groupId>daggerok</groupId>
67
<artifactId>glassfish-ext.js</artifactId>
78
<version>0.0.1</version>
@@ -14,11 +15,13 @@
1415
</properties>
1516

1617
<build>
18+
<defaultGoal>clean package</defaultGoal>
1719
<finalName>${project.artifactId}</finalName>
1820
</build>
1921

2022
<modules>
2123
<module>rest-api</module>
2224
<module>ui</module>
2325
</modules>
26+
2427
</project>

jboss-4-jax-rs/docker-compose-gradle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- "8083:8083"
1515
- "8093:8093"
1616
networks: [backing-services]
17-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
17+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1818

1919
volumes:
2020
gradle-jboss-4-jax-rs-app-data: {}

jboss-4-jax-rs/docker-compose-maven.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ services:
1414
- "8083:8083"
1515
- "8093:8093"
1616
networks: [backing-services]
17-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
17+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1818

1919
volumes:
2020
maven-jboss-4-jax-rs-app-data: {}

kotlin-kafka/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
lombokVersion = "1.16.20"
99
junitJupiterVersion = "5.0.2"
1010
junitPlatformVersion = "1.0.2"
11-
wildflySwarmVersion = "2018.1.0"
11+
wildflySwarmVersion = "2018.3.3"
1212
hibernateCoreVersion = "4.2.18.Final"
1313
}
1414
repositories {

kotlin-kafka/docker-compose-gradle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
volumes: ["gradle-kotlin-kafka-app-data:/home/app"]
1010
ports: ["8080:8080"]
1111
networks: [backing-services]
12-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
12+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1313

1414
volumes:
1515
gradle-kotlin-kafka-app-data: {}

kotlin-kafka/docker-compose-maven.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
volumes: ["maven-kotlin-kafka-app-data:/home/app"]
1010
ports: ["8080:8080"]
1111
networks: [backing-services]
12-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
12+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1313

1414
volumes:
1515
maven-kotlin-kafka-app-data: {}

kotlin-kafka/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<properties>
1313
<kotlin.version>1.2.21</kotlin.version>
1414
<failOnMissingWebXml>false</failOnMissingWebXml>
15-
<version.wildfly.swarm>2018.1.0</version.wildfly.swarm>
15+
<version.wildfly.swarm>2018.3.3</version.wildfly.swarm>
1616
<wildfly-swarm.useUberJar>true</wildfly-swarm.useUberJar>
1717
<java.net.preferIPv4Stack>true</java.net.preferIPv4Stack>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

kotlin-swarm/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
lombokVersion = "1.16.20"
99
junitJupiterVersion = "5.0.2"
1010
junitPlatformVersion = "1.0.2"
11-
wildflySwarmVersion = "2018.1.0"
11+
wildflySwarmVersion = "2018.3.3"
1212
hibernateCoreVersion = "4.2.18.Final"
1313
}
1414
repositories {

kotlin-swarm/docker-compose-gradle.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
volumes: ["gradle-kotlin-swarm-app-data:/home/app"]
1010
ports: ["8080:8080"]
1111
networks: [backing-services]
12-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
12+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1313

1414
volumes:
1515
gradle-kotlin-swarm-app-data: {}

kotlin-swarm/docker-compose-maven.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ services:
99
volumes: ["maven-kotlin-swarm-app-data:/home/app"]
1010
ports: ["8080:8080"]
1111
networks: [backing-services]
12-
mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
12+
#mem_limit: 786432000 # container limit: 700Mb (700 * 1024 * 1024)
1313

1414
volumes:
1515
maven-kotlin-swarm-app-data: {}

0 commit comments

Comments
 (0)