diff --git a/.github/workflows/electorrent-workflow.yml b/.github/workflows/electorrent-workflow.yml index 7822dbab..76cee326 100644 --- a/.github/workflows/electorrent-workflow.yml +++ b/.github/workflows/electorrent-workflow.yml @@ -67,6 +67,7 @@ jobs: with: node-version: ${{ env.NODE_VERSION }} cache: 'npm' + - uses: actions/setup-python@v4 - name: Cache npm modules uses: actions/cache@v2 with: diff --git a/test/shared/nginx/Dockerfile b/test/shared/nginx/Dockerfile index b752d507..28b26fbc 100644 --- a/test/shared/nginx/Dockerfile +++ b/test/shared/nginx/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:alpine +FROM nginx:1.25-alpine # Install openssl to generate x509 certs on startup RUN apk add openssl diff --git a/test/shared/nginx/rootfs/etc/nginx/templates/default.conf.template b/test/shared/nginx/rootfs/etc/nginx/templates/default.conf.template index 084ca0eb..2ee9eaea 100644 --- a/test/shared/nginx/rootfs/etc/nginx/templates/default.conf.template +++ b/test/shared/nginx/rootfs/etc/nginx/templates/default.conf.template @@ -20,7 +20,6 @@ server { ## See the keepalive_timeout directive in nginx.conf. ## Server certificate and key. - ssl on; ssl_certificate /etc/ssl/certs/dummy.crt; ssl_certificate_key /etc/ssl/private/dummy.key; ssl_session_timeout 5m;