From ddbb7c71aae4fcdc646df295128a4846c6f36ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ja=C5=A1ek?= Date: Wed, 25 Oct 2023 07:41:17 +0200 Subject: [PATCH] fix docker e2e setup (#1872) --- .dockerignore | 2 +- e2e/docker-compose.yml | 13 +++++++------ e2e/server/Procfile | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.dockerignore b/.dockerignore index 45c6d6469..43da9ce3c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -12,5 +12,5 @@ node_modules client e2e/node_modules e2e/server/env +e2e/dist server/env - diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml index 7c2ae3daf..b0e8eaab5 100644 --- a/e2e/docker-compose.yml +++ b/e2e/docker-compose.yml @@ -28,6 +28,7 @@ services: dockerfile: e2e/server/Dockerfile ports: - "5000:5000" + - "5100:5100" networks: - e2e depends_on: @@ -37,12 +38,12 @@ services: environment: - WEB_CONCURRENCY=2 - WEBPACK_MANIFEST_PATH=/opt/client-dist/manifest.json - - MONGO_URI=mongodb://mongo/superdesk - - ARCHIVED_MONGO_URI=mongodb://mongo/superdesk - - CONTENTAPI_MONGO_URI=mongodb://mongo/superdesk_capi - - PUBLICAPI_MONGO_URI=mongodb://mongo/superdesk_papi - - LEGAL_ARCHIVE_URI=mongodb://mongo/superdesk_legal - - ARCHIVED_URI=mongodb://mongo/superdesk_archive + - MONGO_URI=mongodb://mongo/e2e_superdesk + - ARCHIVED_MONGO_URI=mongodb://mongo/e2e_archived + - CONTENTAPI_MONGO_URI=mongodb://mongo/e2e_capi + - PUBLICAPI_MONGO_URI=mongodb://mongo/e2e_pubapi + - LEGAL_ARCHIVE_URI=mongodb://mongo/e2e_legal + - ARCHIVED_URI=mongodb://mongo/e2e_archived - ELASTICSEARCH_URL=http://elastic:9200 - ELASTICSEARCH_INDEX=superdesk_e2e - CELERY_BROKER_URL=redis://redis:6379/1 diff --git a/e2e/server/Procfile b/e2e/server/Procfile index b7d5a0163..aec261efb 100644 --- a/e2e/server/Procfile +++ b/e2e/server/Procfile @@ -1,3 +1,3 @@ -web: python3 -u web.py rest: gunicorn -c gunicorn_config.py wsgi wamp: python3 -u ws.py +web: python3 -m http.server -d ../dist 9000 \ No newline at end of file