Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 3 additions & 5 deletions server/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
condition: service_healthy
restart: true
healthcheck:
test: netstat | grep cf
test: curl -s -f http://localhost:8080/ChannelFinder
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tests channelfinder is up, not recceiver.

interval: 10s
timeout: 30s
retries: 3
Expand All @@ -23,16 +23,14 @@ services:
RECCEIVER_CF_USERNAME: admin
RECCEIVER_CF_CFUSERNAME: admin
RECCEIVER_CF_CFPASSWORD: password
RECCEIVER_CF_BASEURL: http://cf:8080/ChannelFinder
RECCEIVER_CF_BASEURL: http://localhost:8080/ChannelFinder
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the integration tests which have "cf" as the hostname for channelfinder.

RECCEIVER_CF_VERIFYSSL: FALSE
volumes:
- type: bind
source: docker/config/cf.conf
target: /home/recceiver/channelfinderapi.conf
read_only: true
networks:
- net-1-recc-1
- net-2-cf
network_mode: host

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this. This will.mean container IOC's won't have access to recceiver here?

As mentioned before this will break the integration tests.

networks:
net-1-recc-1:
Expand Down
2 changes: 1 addition & 1 deletion server/docker/cf-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
networks:
- net-2-cf
ports:
- "8080"
- "8080:8080"
depends_on:
elasticsearch:
condition: service_healthy
Expand Down
Loading