From 3c33d10ca0e5553724151a2118ae0bda48472d73 Mon Sep 17 00:00:00 2001 From: realaravinth Date: Thu, 23 Jun 2022 21:24:21 +0530 Subject: [PATCH] fix: mv test dependency services to woodpecker config file --- .woodpecker.yml | 17 ++++++++++++++++- integration/tests.sh | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 3a25798..e6350e8 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,7 +5,6 @@ pipeline: - DATABSE_URL=postgres://postgres:password@database:5432/postgres - EMAIL_URL=smtp://admin:password@localhost:10025 commands: - - ( apt update && apt install -y docker-compose >&1 )> /dev/null - pip install virtualenv - make env - make lint @@ -19,3 +18,19 @@ services: image: postgres environment: - POSTGRES_PASSWORD=password + + gitea: + image: gitea/gitea:1.16.5 + container_name: hostea-dash-gitea + # network_mode: host + restart: always + + smtp: + image: maildev/maildev:latest + restart: always + container_name: hostea-dash-maildev + # network_mode: host + environment: + - MAILDEV_SMTP_PORT=10025 + - MAILDEV_INCOMING_USER=admin + - MAILDEV_INCOMING_PASS=password diff --git a/integration/tests.sh b/integration/tests.sh index 1527648..c870d57 100755 --- a/integration/tests.sh +++ b/integration/tests.sh @@ -125,11 +125,11 @@ SERVER_PID="" setup_env() { nohup python manage.py runserver > /dev/null 2>&1 & SERVER_PID=$! - docker-compose -f docker-compose-dev-deps.yml up --detach + #docker-compose -f docker-compose-dev-deps.yml up --detach } teardown_env() { - docker-compose -f docker-compose-dev-deps.yml down --remove-orphans + #docker-compose -f docker-compose-dev-deps.yml down --remove-orphans kill $SERVER_PID }