Skip to content

Commit

Permalink
Development: Fix an issue with multi node e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche committed Dec 22, 2024
1 parent ee7ada3 commit e47db93
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion docker/nginx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
nginx:
# nginx setup based on artemis prod ansible repository
container_name: artemis-nginx
image: docker.io/library/nginx:1.27.3-alpine-slim
image: docker.io/library/nginx:1.27.3
pull_policy: if_not_present
volumes:
- ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
Expand Down
2 changes: 1 addition & 1 deletion docker/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# default config /etc/nginx/nginx.conf from the nginx:1.27.3-alpine-slim docker image
# default config /etc/nginx/nginx.conf from the nginx:1.27.3 docker image
# comment specific Artemis changes!

user nginx;
Expand Down
32 changes: 16 additions & 16 deletions src/test/playwright/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/test/playwright/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
"private": true,
"license": "MIT",
"devDependencies": {
"@playwright/test": "1.49.0",
"@playwright/test": "1.49.1",
"cross-env": "7.0.3",
"dayjs": "1.11.13",
"dotenv": "16.4.7",
"junit-merge": "2.0.0",
"npm-check-updates": "17.1.11",
"npm-check-updates": "17.1.12",
"npm-run-all": "4.1.5",
"simple-git": "3.27.0",
"uuid": "11.0.3"
Expand Down
2 changes: 1 addition & 1 deletion supporting_scripts/playwright/setupUsers.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ artemis_path="$(readlink -f "$(dirname $0)/../..")"
cd "$artemis_path/supporting_scripts"

if [ ! -d "venv" ]; then
python -m venv venv
python3 -m venv venv
fi

source venv/bin/activate
Expand Down

0 comments on commit e47db93

Please sign in to comment.