mirror of
https://git.sr.ht/~tsileo/microblog.pub
synced 2024-12-22 21:24:28 +00:00
Tweak/fix the CI
This commit is contained in:
parent
505d2add43
commit
133d02b48d
2 changed files with 8 additions and 26 deletions
|
@ -52,7 +52,7 @@ steps:
|
||||||
POUSSETACHES_AUTH_KEY: lol
|
POUSSETACHES_AUTH_KEY: lol
|
||||||
commands:
|
commands:
|
||||||
- sleep 5
|
- sleep 5
|
||||||
- 'docker run -p 5006:5005 --net fede -v "`pwd`/tests/fixtures/instance1/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e POUSSETACHES_AUTH_KEY --name instance1_web microblogpub'
|
- 'docker run -p 5006:5005 --net fede -v "`pwd`/tests/fixtures/instance1/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e MICROBLOGPUB_POUSSETACHES_HOST -e POUSSETACHES_AUTH_KEY --name instance1_web microblogpub'
|
||||||
|
|
||||||
- name: microblogpub_instance2
|
- name: microblogpub_instance2
|
||||||
image: docker:dind
|
image: docker:dind
|
||||||
|
@ -65,7 +65,7 @@ steps:
|
||||||
MICROBLOGPUB_MONGODB_HOST: mongo:27017
|
MICROBLOGPUB_MONGODB_HOST: mongo:27017
|
||||||
POUSSETACHES_AUTH_KEY: lol
|
POUSSETACHES_AUTH_KEY: lol
|
||||||
commands:
|
commands:
|
||||||
- 'docker run -p 5007:5005 --net fede -v "`pwd`/tests/fixtures/instance2/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e POUSSETACHES_AUTH_KEY --name instance2_web microblogpub'
|
- 'docker run -p 5007:5005 --net fede -v "`pwd`/tests/fixtures/instance2/config:/app/config" -e MICROBLOGPUB_DEBUG -e MICROBLOGPUB_INTERNAL_HOST -e MICROBLOGPUB_MONGODB_HOST -e MICROBLOGPUB_POUSSETACHES_HOST -e POUSSETACHES_AUTH_KEY --name instance2_web microblogpub'
|
||||||
|
|
||||||
|
|
||||||
- name: integration_test
|
- name: integration_test
|
||||||
|
|
|
@ -1,32 +1,14 @@
|
||||||
version: '3'
|
version: '3'
|
||||||
services:
|
services:
|
||||||
flower:
|
|
||||||
image: microblogpub:latest
|
|
||||||
links:
|
|
||||||
- mongo
|
|
||||||
- rabbitmq
|
|
||||||
command: 'celery flower -l info -A tasks --broker amqp://guest@rabbitmq// --address=0.0.0.0 --port=5556'
|
|
||||||
environment:
|
|
||||||
- MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rabbitmq//
|
|
||||||
- MICROBLOGPUB_MONGODB_HOST=mongo:27017
|
|
||||||
ports:
|
|
||||||
- "5556:5556"
|
|
||||||
celery:
|
|
||||||
image: microblogpub:latest
|
|
||||||
links:
|
|
||||||
- mongo
|
|
||||||
- rabbitmq
|
|
||||||
command: 'celery worker -l info -A tasks'
|
|
||||||
environment:
|
|
||||||
- MICROBLOGPUB_AMQP_BROKER=pyamqp://guest@rabbitmq//
|
|
||||||
- MICROBLOGPUB_MONGODB_HOST=mongo:27017
|
|
||||||
mongo:
|
mongo:
|
||||||
image: "mongo:latest"
|
image: "mongo:latest"
|
||||||
volumes:
|
volumes:
|
||||||
- "./data:/data/db"
|
- "./data:/data/db"
|
||||||
ports:
|
ports:
|
||||||
- "27017:27017"
|
- "27017:27017"
|
||||||
rabbitmq:
|
poussetaches:
|
||||||
image: "rabbitmq:latest"
|
image: "poussetaches:latest"
|
||||||
ports:
|
volumes:
|
||||||
- "5672:5672"
|
- "${DATA_DIR}/poussetaches:/app/poussetaches_data"
|
||||||
|
environment:
|
||||||
|
- POUSSETACHES_AUTH_KEY=${POUSSETACHES_AUTH_KEY}
|
||||||
|
|
Loading…
Reference in a new issue