Skip to content

Add notification service to docker compose #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
ef2c989
Add notification service to docker compose
Jul 27, 2018
d221cd3
Fix spacing
Jul 27, 2018
dd92e3d
Changed Docker-Compose version to 2.3 to run tests in order to limit …
jusoto Jul 30, 2018
d2d370a
Changes:
jusoto Aug 17, 2018
361b184
Added:
jusoto Dec 4, 2018
c615144
added travis_wait for tests
jusoto Dec 7, 2018
fdaca35
Added ./gradlew clean build to travis_wait
jusoto Dec 7, 2018
c377a71
Intregration tests created on independent setups to consume less reso…
jusoto Dec 7, 2018
4a3e1a6
Added time_wait 30 min for ./gradle check
jusoto Dec 7, 2018
b830898
Show log info on travis
jusoto Dec 7, 2018
e5f139d
Added maximum time wait for running tests with docker containers
jusoto Dec 7, 2018
a162fa6
Added environment variables for tests
jusoto Dec 7, 2018
e0f627b
Output IP ports in logs
jusoto Dec 7, 2018
36ce474
Added new testing variation of healthy container for travis
jusoto Dec 11, 2018
fa6a1ae
test changes for travis
jusoto Dec 11, 2018
19cba19
join together different test cases files into one for travis
jusoto Dec 11, 2018
ba62577
add previous setup for testing ports on containers for travis
jusoto Dec 11, 2018
4488eb3
userservice test case port validation
jusoto Dec 11, 2018
71a8607
test cases trip query containers validation port
jusoto Dec 11, 2018
01b860e
test cases included calculation port validation
jusoto Dec 11, 2018
1084fe4
test cases use container name to create HTTP requests
jusoto Dec 11, 2018
d3fe1f4
test cases, use localhost instead of container name
jusoto Dec 11, 2018
e5c759f
added environment variables for dependencies host names
jusoto Dec 11, 2018
185ecb8
test cases remove localhost from userServiceURL
jusoto Dec 11, 2018
5488400
Added output aid to check active containers before running tests
jusoto Dec 12, 2018
3c741b0
Removed duplicated rt line on tests file
jusoto Dec 12, 2018
89ab3d7
Added missing IOException on tests
jusoto Dec 12, 2018
2504807
Added docker inspect to show details of docker environment on travis
jusoto Dec 12, 2018
e02f6f3
removed $ from docker inspect
jusoto Dec 12, 2018
3f37e3c
Added flag for docker inspect on test cases
jusoto Dec 12, 2018
26be5c0
test cases - added log feature with details of running containers
jusoto Dec 13, 2018
cac6b50
Tests: Added ip address 0.0.0.0 to communicate with containers
jusoto Dec 14, 2018
7c56a8c
Tests: retrieve information about docker environment
jusoto Dec 14, 2018
c10cac5
Tests: Removed container named URLs
jusoto Dec 14, 2018
7b48a60
Tests: fixed style issues.
jusoto Dec 14, 2018
8253287
Tests: added docker info command to log
jusoto Dec 14, 2018
3b62459
Test cases: added links for dependencies
jusoto Dec 17, 2018
b0b9da3
Test cases: changed to localhost
jusoto Dec 17, 2018
9ec2613
Test cases: Added log info to track requests
jusoto Dec 19, 2018
f5f0768
Test cases: DOCKER_IP env changed to localhost
jusoto Dec 19, 2018
df7bc70
Test cases: exchanged localhost by env HOST
jusoto Dec 19, 2018
17fd8b7
Test cases: replaced env HOST by inFormat function
jusoto Dec 19, 2018
fa07e6e
Test cases: changed HOST to DOCKER_HOST
jusoto Dec 19, 2018
b36bba8
Test cases: double check user service
jusoto Dec 19, 2018
6ae0410
Test cases: removed initial check on user service
jusoto Dec 19, 2018
f2a9956
Test cases: fix https for http
jusoto Dec 19, 2018
c3cdb26
Test cases: removed individual integration test files
jusoto Dec 19, 2018
ea031a3
Test cases: replaced if for while for checking opened ports
jusoto Dec 21, 2018
2203a6c
Travis time_wait 15
jusoto Dec 21, 2018
0d1471d
Travis time_wait changed to 10
jusoto Dec 21, 2018
146161f
Removed travis time_wait configuration
jusoto Dec 21, 2018
7f0f214
Changed travis script to gradle instead of gradlew
jusoto Dec 21, 2018
953caa0
removed travis time_wait
jusoto Dec 21, 2018
69a9d42
Test cases: removed userservice check on dockercomposerule initializa…
jusoto Dec 21, 2018
cb43ead
Test cases: included debug info with opened ports
jusoto Dec 21, 2018
bec603c
Travis: Fix health checks for test cases
jusoto Jan 29, 2019
1eaa868
Travis: remove health check for port 8761 in test cases
jusoto Jan 29, 2019
3e47f97
Travis: Pushing files from linux environment
jusoto Feb 25, 2019
5681107
travis: Added time sleep 20 seconds during test setup to allow pullin…
jusoto Mar 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ services:
depends_on:
- discoveryservice

notificationservice:
depends_on:
- discoveryservice
- rabbitmq
image: aista/notification-service
command: notification-service
ports:
- "32700:32700"
environment:
- RABBIT_HOST=rabbitmq
- EUREKA_SERVER=discoveryservice

discoveryservice:
image: aista/eureka
ports:
Expand Down