diff --git a/docker/nginx.yml b/docker/nginx.yml index 8bf6e1cccb5c..4a5988717061 100644 --- a/docker/nginx.yml +++ b/docker/nginx.yml @@ -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 diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf index b309c3e3e995..a825fdf6a98f 100644 --- a/docker/nginx/nginx.conf +++ b/docker/nginx/nginx.conf @@ -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; diff --git a/src/test/playwright/package-lock.json b/src/test/playwright/package-lock.json index c7aef6f2bf2a..f7f1cccc6cb4 100644 --- a/src/test/playwright/package-lock.json +++ b/src/test/playwright/package-lock.json @@ -7,12 +7,12 @@ "name": "artemis_playwright", "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" @@ -36,13 +36,13 @@ "license": "MIT" }, "node_modules/@playwright/test": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.0.tgz", - "integrity": "sha512-DMulbwQURa8rNIQrf94+jPJQ4FmOVdpE5ZppRNvWVjvhC+6sOeo28r8MgIpQRYouXRtt/FCCXU7zn20jnHR4Qw==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.49.1.tgz", + "integrity": "sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.49.0" + "playwright": "1.49.1" }, "bin": { "playwright": "cli.js" @@ -1136,9 +1136,9 @@ } }, "node_modules/npm-check-updates": { - "version": "17.1.11", - "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.11.tgz", - "integrity": "sha512-TR2RuGIH7P3Qrb0jfdC/nT7JWqXPKjDlxuNQt3kx4oNVf1Pn5SBRB7KLypgYZhruivJthgTtfkkyK4mz342VjA==", + "version": "17.1.12", + "resolved": "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-17.1.12.tgz", + "integrity": "sha512-j1+ln9wXDNLgTSMrEF9ja4KyYq4yBF8FuuU3irFtMSnss4pYjvYfQESz8CV82Rk1daXjbtaAWF9pZZKzujhoBA==", "dev": true, "license": "Apache-2.0", "bin": { @@ -1349,13 +1349,13 @@ } }, "node_modules/playwright": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.0.tgz", - "integrity": "sha512-eKpmys0UFDnfNb3vfsf8Vx2LEOtflgRebl0Im2eQQnYMA4Aqd+Zw8bEOB+7ZKvN76901mRnqdsiOGKxzVTbi7A==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz", + "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.49.0" + "playwright-core": "1.49.1" }, "bin": { "playwright": "cli.js" @@ -1368,9 +1368,9 @@ } }, "node_modules/playwright-core": { - "version": "1.49.0", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.0.tgz", - "integrity": "sha512-R+3KKTQF3npy5GTiKH/T+kdhoJfJojjHESR1YEWhYuEKRVfVaxH3+4+GvXE5xyCngCxhxnykk0Vlah9v8fs3jA==", + "version": "1.49.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz", + "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==", "dev": true, "license": "Apache-2.0", "bin": { diff --git a/src/test/playwright/package.json b/src/test/playwright/package.json index 5e37ba3caba9..377ceee6b957 100644 --- a/src/test/playwright/package.json +++ b/src/test/playwright/package.json @@ -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" diff --git a/supporting_scripts/playwright/setupUsers.sh b/supporting_scripts/playwright/setupUsers.sh index 19677c16d28f..cab70289a9d7 100755 --- a/supporting_scripts/playwright/setupUsers.sh +++ b/supporting_scripts/playwright/setupUsers.sh @@ -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