diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index 4f6293a0..95828679 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -16,7 +16,7 @@ jobs: pre: # Verification to be done before the real check name: Pre-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: should_skip: ${{ steps.skip_flag.outputs.should_skip }} steps: @@ -86,7 +86,7 @@ jobs: - name: Stop containers run: docker compose -f docker-compose.yml -f docker-compose.e2e.yml --profile e2e down - - uses: sonarsource/sonarqube-scan-action@master + - uses: sonarsource/sonarqube-scan-action@v2 env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }} diff --git a/client-e2e/images/Dockerfile.chrome b/client-e2e/images/Dockerfile.chrome index 4370295a..614c46a3 100644 --- a/client-e2e/images/Dockerfile.chrome +++ b/client-e2e/images/Dockerfile.chrome @@ -1,3 +1,3 @@ -FROM selenium/node-chrome:4.9.1-20230508 +FROM selenium/node-chrome:4.11.0-20230801 RUN mkdir /home/seluser/downloads && chown 1200:1201 /home/seluser/downloads -CMD ["/opt/bin/entry_point.sh"] \ No newline at end of file +CMD ["/opt/bin/entry_point.sh"] diff --git a/client-e2e/images/Dockerfile.chrome-arm64 b/client-e2e/images/Dockerfile.chrome-arm64 index e8c19e9f..39633129 100644 --- a/client-e2e/images/Dockerfile.chrome-arm64 +++ b/client-e2e/images/Dockerfile.chrome-arm64 @@ -1,3 +1,3 @@ -FROM seleniarm/node-chromium:latest +FROM seleniarm/node-chromium:4.11.0-20230801 RUN mkdir /home/seluser/downloads && chown 1200:1201 /home/seluser/downloads CMD ["/opt/bin/entry_point.sh"] diff --git a/client-e2e/images/Dockerfile.edge b/client-e2e/images/Dockerfile.edge index 7865c526..280b67af 100644 --- a/client-e2e/images/Dockerfile.edge +++ b/client-e2e/images/Dockerfile.edge @@ -1,3 +1,3 @@ -FROM selenium/node-edge:4.9.1-20230508 +FROM selenium/node-edge:4.11.0-20230801 RUN mkdir /home/seluser/downloads && chown 1200:1201 /home/seluser/downloads -CMD ["/opt/bin/entry_point.sh"] \ No newline at end of file +CMD ["/opt/bin/entry_point.sh"] diff --git a/client-e2e/images/Dockerfile.firefox b/client-e2e/images/Dockerfile.firefox index 8e5f081e..250acbb0 100644 --- a/client-e2e/images/Dockerfile.firefox +++ b/client-e2e/images/Dockerfile.firefox @@ -1,3 +1,3 @@ -FROM selenium/node-firefox:4.9.1-20230508 +FROM selenium/node-firefox:4.11.0-20230801 RUN mkdir /home/seluser/downloads && chown 1200:1201 /home/seluser/downloads -CMD ["/opt/bin/entry_point.sh"] \ No newline at end of file +CMD ["/opt/bin/entry_point.sh"] diff --git a/client-e2e/images/Dockerfile.firefox-arm64 b/client-e2e/images/Dockerfile.firefox-arm64 index ac63cfdc..f71c98b0 100644 --- a/client-e2e/images/Dockerfile.firefox-arm64 +++ b/client-e2e/images/Dockerfile.firefox-arm64 @@ -1,3 +1,3 @@ -FROM seleniarm/node-firefox:latest +FROM seleniarm/node-firefox:4.11.0-20230801 RUN mkdir /home/seluser/downloads && chown 1200:1201 /home/seluser/downloads CMD ["/opt/bin/entry_point.sh"] diff --git a/docker-compose.e2e-arm64.yml b/docker-compose.e2e-arm64.yml index 542e0100..e2957a24 100644 --- a/docker-compose.e2e-arm64.yml +++ b/docker-compose.e2e-arm64.yml @@ -7,7 +7,7 @@ services: build: dockerfile: ./client-e2e/images/Dockerfile.firefox-arm64 selenium-hub: - image: seleniarm/hub:latest + image: seleniarm/hub:4.11.0-20230801 client-e2e: depends_on: chrome: diff --git a/docker-compose.yml b/docker-compose.yml index 8ebb59cc..2c9ecec5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,11 @@ version: "3.9" services: mailbox: - image: leastauthority/magic-wormhole-mailbox:latest + image: leastauthority/magic-wormhole-mailbox:22.11.1 ports: - "4000:4000" # WebSocket relay: - image: leastauthority/magic-wormhole-relay:latest + image: leastauthority/magic-wormhole-relay:22.11.1 ports: - "4001:4001" # TCP - "4002:4002" # WebSocket @@ -113,7 +113,7 @@ services: profiles: - e2e selenium-hub: - image: selenium/hub:4.9.1-20230508 + image: selenium/hub:4.11.0-20230801 container_name: selenium-hub ports: - "4442:4442"