From ba9f637748b442057e0dcc2b9431c3553c5039fd Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 15 Apr 2025 09:26:31 +0100 Subject: [PATCH 1/7] Upgrade workflow agents from 22.04 to 24.04 --- .github/workflows/codeql-analysis.yml | 31 +++++++++---------- .github/workflows/npm-publish.yml | 2 +- .github/workflows/release-drafter.yml | 2 +- .github/workflows/test.yml | 14 ++++----- .../windows-test-command-dispatch.yml | 2 +- 5 files changed, 25 insertions(+), 26 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f2f3e70d4..52eee6c1d 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,17 +2,17 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [main] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [main] schedule: - - cron: '17 5 * * 2' + - cron: "17 5 * * 2" jobs: analyze: name: Analyze - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 permissions: actions: read contents: read @@ -20,17 +20,16 @@ jobs: strategy: fail-fast: false matrix: - language: [ 'javascript' ] + language: ["javascript"] steps: - - name: Checkout repository - uses: actions/checkout@v4 - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - - name: Autobuild - uses: github/codeql-action/autobuild@v3 - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - + - name: Checkout repository + uses: actions/checkout@v4 + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + - name: Autobuild + uses: github/codeql-action/autobuild@v3 + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml index be25de0a8..e8eaca7bf 100644 --- a/.github/workflows/npm-publish.yml +++ b/.github/workflows/npm-publish.yml @@ -6,7 +6,7 @@ on: jobs: publish: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 with: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 50e6b7cdb..3ce87ae46 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -10,7 +10,7 @@ on: jobs: update_release_draft: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Drafts your next Release notes as Pull Requests are merged into "main" - uses: release-drafter/release-drafter@v5 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5bd05e01..2d67de5f3 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -21,7 +21,7 @@ concurrency: jobs: detect-modules: name: Detect packages to check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: modules: ${{ steps.set-modified-modules.outputs.modules }} modules_count: ${{ steps.set-modified-modules-count.outputs.modules_count }} @@ -57,7 +57,7 @@ jobs: fail-fast: true matrix: module: ${{ fromJSON(needs.detect-modules.outputs.modules) }} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Code checkout uses: actions/checkout@v4 @@ -65,7 +65,7 @@ jobs: id: npm-install uses: ./.github/actions/npm-setup with: - runner: ubuntu-22.04 + runner: ubuntu-24.04 node-version: 22.x workspace: "${{ matrix.module }}" - name: Code linting @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: true matrix: - runner: [ubuntu-22.04] + runner: [ubuntu-24.04] node-version: [18.x, 20.x, 22.x] runs-on: ${{ matrix.runner }} steps: @@ -119,7 +119,7 @@ jobs: node-version: [18.x, 20.x, 22.x] uses: ./.github/workflows/test-template.yml with: - runner: ubuntu-22.04 + runner: ubuntu-24.04 node-version: ${{ matrix.node-version }} container-runtime: docker workspace: "${{ matrix.module }}" @@ -139,7 +139,7 @@ jobs: node-version: [18.x, 20.x, 22.x] uses: ./.github/workflows/test-template.yml with: - runner: ubuntu-22.04 + runner: ubuntu-24.04 node-version: ${{ matrix.node-version }} container-runtime: podman workspace: "${{ matrix.module }}" @@ -153,7 +153,7 @@ jobs: - smoke-test - test - test-podman - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check if any jobs failed if: ${{ failure() || cancelled() }} diff --git a/.github/workflows/windows-test-command-dispatch.yml b/.github/workflows/windows-test-command-dispatch.yml index 89c742615..5eb5a6409 100644 --- a/.github/workflows/windows-test-command-dispatch.yml +++ b/.github/workflows/windows-test-command-dispatch.yml @@ -6,7 +6,7 @@ on: jobs: windows-test-command-dispatch: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Dispatch windows-test command From 44b496c5b69e569b995568efca0927dcf7976fe0 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Tue, 15 Apr 2025 09:54:21 +0100 Subject: [PATCH 2/7] Use official podman --- .github/workflows/test-template.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index 9e077ea0c..b125aa105 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -34,8 +34,6 @@ jobs: - name: Podman setup if: ${{ inputs.container-runtime == 'podman' }} run: | - curl -fsSL "https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/Release.key" | gpg --dearmor | sudo tee /etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg > /dev/null - echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/devel_kubic_libcontainers_unstable.gpg] https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/unstable/xUbuntu_$(lsb_release -rs)/ /" | sudo tee /etc/apt/sources.list.d/devel:kubic:libcontainers:unstable.list > /dev/null sudo apt-get update sudo apt-get -y install podman systemctl enable --now --user podman podman.socket From 11c9338251bba0deb08bcc698634da28c42db8b2 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Fri, 9 May 2025 09:12:31 +0100 Subject: [PATCH 3/7] Try rootful podman --- .github/workflows/test-template.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index b125aa105..fd7ff9c5c 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -36,10 +36,9 @@ jobs: run: | sudo apt-get update sudo apt-get -y install podman - systemctl enable --now --user podman podman.socket + sudo systemctl enable --now podman.socket podman info echo "DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV - echo "CI_ROOTLESS=true" >> $GITHUB_ENV echo "CI_PODMAN=true" >> $GITHUB_ENV - name: Colima constraints From 257e4e5e755cbc68072b54f3c8ab5d073573c3e4 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Fri, 9 May 2025 09:32:51 +0100 Subject: [PATCH 4/7] Update Podman DOCKER_HOST --- .github/workflows/test-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index fd7ff9c5c..1127c1f01 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -38,7 +38,7 @@ jobs: sudo apt-get -y install podman sudo systemctl enable --now podman.socket podman info - echo "DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$(podman info --format '{{.Host.RemoteSocket.Path}}') >> $GITHUB_ENV echo "CI_PODMAN=true" >> $GITHUB_ENV - name: Colima constraints From fe6fc59d1d77c73b4df07ddb59b2ba747639284c Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Fri, 9 May 2025 12:58:35 +0100 Subject: [PATCH 5/7] Update Podman DOCKER_HOST --- .github/workflows/test-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-template.yml b/.github/workflows/test-template.yml index 1127c1f01..792e086a3 100644 --- a/.github/workflows/test-template.yml +++ b/.github/workflows/test-template.yml @@ -38,7 +38,7 @@ jobs: sudo apt-get -y install podman sudo systemctl enable --now podman.socket podman info - echo "DOCKER_HOST=unix://$(podman info --format '{{.Host.RemoteSocket.Path}}') >> $GITHUB_ENV + echo "DOCKER_HOST=unix://$(podman info --format '{{.Host.RemoteSocket.Path}}')" >> $GITHUB_ENV echo "CI_PODMAN=true" >> $GITHUB_ENV - name: Colima constraints From cb0eb78f6095469e3d690f70f09a8a0b139b9ea6 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Fri, 9 May 2025 13:14:28 +0100 Subject: [PATCH 6/7] Remove compose fixture versions --- docker-compose.yml | 2 -- .../fixtures/docker-compose/docker-compose-malformed.yml | 2 -- .../docker-compose-with-env-file/docker-compose.yml | 2 -- .../fixtures/docker-compose/docker-compose-with-env.yml | 2 -- .../docker-compose-with-healthcheck-unhealthy.yml | 2 -- .../docker-compose-with-healthcheck-with-start-period.yml | 2 -- .../fixtures/docker-compose/docker-compose-with-healthcheck.yml | 2 -- .../docker-compose/docker-compose-with-many-services.yml | 2 -- .../fixtures/docker-compose/docker-compose-with-name.yml | 2 -- .../docker-compose-with-override/docker-compose-update.yml | 2 -- .../docker-compose-with-override/docker-compose.yml | 2 -- .../docker-compose/docker-compose-with-private-port.yml | 2 -- .../fixtures/docker-compose/docker-compose-with-profile.yml | 2 -- .../fixtures/docker-compose/docker-compose-with-volume.yml | 2 -- .../testcontainers/fixtures/docker-compose/docker-compose.yml | 2 -- 15 files changed, 30 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7c8c2b248..f3cafb7f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.7" - services: docs: image: python:3.8 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml index ad2188dc8..62450b158 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml @@ -1,5 +1,3 @@ -version: 3 - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml index 6ee1b7ab7..196a9dcc2 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env-file/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml index 6ee1b7ab7..196a9dcc2 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-env.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml index 4e33bdbe2..40cf54923 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-unhealthy.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml index 160da896b..2c14b6a63 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck-with-start-period.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml index 156454608..8936c1308 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-healthcheck.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml index 8a27089d6..61abe6fc8 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-many-services.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: service_1: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml index c0388aabe..045479673 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-name.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: db: container_name: ${CONTAINER_NAME:-custom_container_name} diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml index 3ec3280d5..dbd90d33a 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose-update.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: environment: diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml index ba01cfb8e..f93fea443 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-override/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml index b9bbb72c5..61ddcfdae 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-private-port.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml index 0a20be447..452316fe5 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-profile.yml @@ -1,5 +1,3 @@ -version: "3.9" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml index 11217bc13..d79e61e15 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-with-volume.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose.yml index 82aacb193..66c33e9d3 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.5" - services: container: image: cristianrgreco/testcontainer:1.1.14 From 231c8a8af25d884f04740f86caf27c4ed99c1121 Mon Sep 17 00:00:00 2001 From: Cristian Greco Date: Fri, 9 May 2025 13:47:37 +0100 Subject: [PATCH 7/7] Fix malformed docker-compose fixture --- .../docker-compose/docker-compose-malformed.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml index 62450b158..1ea2cb73d 100644 --- a/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml +++ b/packages/testcontainers/fixtures/docker-compose/docker-compose-malformed.yml @@ -1,9 +1 @@ -services: - container: - image: cristianrgreco/testcontainer:1.1.14 - ports: - - 8080 - another-container: - image: cristianrgreco/testcontainer:1.1.14 - ports: - - 8080 +MALFORMED \ No newline at end of file