Skip to content

Commit

Permalink
More hostname fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
vpetersson committed Feb 23, 2023
1 parent a285929 commit 8d21d2b
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ jobs:
- name: Run the tests inside the container
shell: 'script -q -e -c "bash {0}"'
run: |
docker compose -f docker-compose.test.yml exec srly-ose-test bash ./bin/prepare_test_environment.sh -s
docker compose -f docker-compose.test.yml exec srly-ose-test nosetests -v -a '!fixme'
docker compose -f docker-compose.test.yml exec anthias-test bash ./bin/prepare_test_environment.sh -s
docker compose -f docker-compose.test.yml exec anthias-test nosetests -v -a '!fixme'
- name: Stop the test container
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ Run the unit tests.
$ ./bin/build_containers.sh
$ docker-compose \
-f docker-compose.test.yml \
exec -T srly-ose-test bash ./bin/prepare_test_environment.sh -s
exec -T anthias-test bash ./bin/prepare_test_environment.sh -s
$ docker-compose \
-f docker-compose.test.yml \
exec -T srly-ose-test nosetests -v -a '!fixme'
exec -T anthias-test nosetests -v -a '!fixme'
```
22 changes: 11 additions & 11 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2.2"
services:
srly-ose-server:
anthias-server:
build:
context: .
dockerfile: docker/Dockerfile.server
Expand All @@ -18,41 +18,41 @@ services:
- ./:/usr/src/app/

# We might bring this in in the future
# srly-ose-viewer:
# anthias-viewer:
# build:
# context: .
# dockerfile: docker/Dockerfile.viewer
# depends_on:
# - srly-ose-server
# - anthias-server
# environment:
# - HOME=/data
# - PORT=80
# - NOREFRESH=1
# - LISTEN=srly-ose-nginx
# - LISTEN=anthias-nginx
# privileged: true
# restart: always
# volumes:
# - resin-data:/data

srly-ose-websocket:
anthias-websocket:
build:
context: .
dockerfile: docker/Dockerfile.websocket
depends_on:
- srly-ose-server
- anthias-server
environment:
- HOME=/data
- LISTEN=0.0.0.0
restart: always
volumes:
- resin-data:/data

srly-ose-celery:
anthias-celery:
build:
context: .
dockerfile: docker/Dockerfile.celery
depends_on:
- srly-ose-server
- anthias-server
- redis
environment:
- HOME=/data
Expand All @@ -66,7 +66,7 @@ services:
platform: "linux/amd64"
image: redis:alpine

srly-ose-nginx:
anthias-nginx:
build:
context: .
dockerfile: docker/Dockerfile.nginx
Expand All @@ -75,8 +75,8 @@ services:
environment:
- HOME=/data
depends_on:
- srly-ose-server
- srly-ose-websocket
- anthias-server
- anthias-websocket
restart: always
volumes:
- resin-data:/data:ro
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: "2.2"
services:
srly-ose-test:
anthias-test:
build:
context: .
dockerfile: docker/Dockerfile.test
Expand All @@ -14,12 +14,12 @@ services:
- .:/usr/src/app
- resin-data:/data

srly-ose-celery:
anthias-celery:
build:
context: .
dockerfile: docker/Dockerfile.celery
depends_on:
- srly-ose-test
- anthias-test
- redis
environment:
- HOME=/data
Expand Down
2 changes: 1 addition & 1 deletion settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def __init__(self):

self.socket = self.context.socket(zmq.PUSH)
self.socket.setsockopt(zmq.LINGER, 0)
self.socket.connect('tcp://srly-ose-server:5558')
self.socket.connect('tcp://anthias-server:5558')

sleep(1)

Expand Down
2 changes: 1 addition & 1 deletion viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def main():
global db_conn, scheduler
setup()

subscriber_1 = ZmqSubscriber('tcp://srly-ose-server:10001')
subscriber_1 = ZmqSubscriber('tcp://anthias-server:10001')
subscriber_1.daemon = True
subscriber_1.start()

Expand Down
2 changes: 1 addition & 1 deletion websocket_server_layer.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def run(self):
socket_incoming = self.context.socket(zmq.SUB)
socket_outgoing = self.context.socket(zmq.PUB)

socket_incoming.connect('tcp://srly-ose-server:10001')
socket_incoming.connect('tcp://anthias-server:10001')
socket_outgoing.bind('inproc://queue')

socket_incoming.setsockopt(zmq.SUBSCRIBE, "")
Expand Down

0 comments on commit 8d21d2b

Please sign in to comment.