Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ba9f637
Upgrade workflow agents from 22.04 to 24.04
cristianrgreco Apr 15, 2025
44b496c
Use official podman
cristianrgreco Apr 15, 2025
11c9338
Try rootful podman
cristianrgreco May 9, 2025
257e4e5
Update Podman DOCKER_HOST
cristianrgreco May 9, 2025
fe6fc59
Update Podman DOCKER_HOST
cristianrgreco May 9, 2025
cb0eb78
Remove compose fixture versions
cristianrgreco May 9, 2025
231c8a8
Fix malformed docker-compose fixture
cristianrgreco May 9, 2025
153f570
Merge branch 'main' into ubuntu-24.04
cristianrgreco May 31, 2025
5c6d85c
Merge branch 'main' into ubuntu-24.04
cristianrgreco Jun 10, 2025
af464be
Merge branch 'main' into ubuntu-24.04
cristianrgreco Jul 5, 2025
3255c46
Merge branch 'main' into ubuntu-24.04
cristianrgreco Jul 22, 2025
451147f
Merge branch 'main' into ubuntu-24.04
cristianrgreco Sep 29, 2025
87ce316
Merge branch 'main' into ubuntu-24.04
cristianrgreco Nov 11, 2025
1b56e3f
Merge branch 'main' into ubuntu-24.04
cristianrgreco Dec 25, 2025
a83cd31
Merge branch 'main' into ubuntu-24.04
cristianrgreco Feb 9, 2026
ac61f27
Merge branch 'main' into ubuntu-24.04
cristianrgreco Feb 17, 2026
d11962f
Merge remote-tracking branch 'origin/main' into ubuntu-24.04
cristianrgreco Feb 18, 2026
63225a7
Use ubuntu-24 workflows and simplify Podman setup
cristianrgreco Feb 18, 2026
ba93898
Force Podman runtime to runc in CI
cristianrgreco Feb 18, 2026
2f4024b
Trigger PR sync
cristianrgreco Feb 18, 2026
73af340
Upgrade Ubuntu Podman packages in CI setup
cristianrgreco Feb 19, 2026
225622c
Merge branch 'main' into ubuntu-24.04
cristianrgreco May 15, 2026
7b9671a
Install podman with redhat-actions/podman-install@main
cristianrgreco May 15, 2026
2457303
Correct podman-version
cristianrgreco May 15, 2026
0d0daa9
Test Podman with rootful socket on Ubuntu 24.04
cristianrgreco May 19, 2026
cc12803
Allow runner to access rootful Podman socket
cristianrgreco May 19, 2026
29342af
Pin Podman install action to Noble packages
cristianrgreco May 19, 2026
23d0e09
Use Kubic Podman packages for Ubuntu 24.04
cristianrgreco May 19, 2026
ab44d17
Use Podman 5 with rootful socket access in CI
cristianrgreco May 19, 2026
897c540
Derive Podman socket path in CI
cristianrgreco May 19, 2026
532287a
Use runner temp path for Podman socket
cristianrgreco May 19, 2026
4ad8525
Adjust Podman 5 test expectations
cristianrgreco May 19, 2026
8796580
Simplify rootful Podman socket setup
cristianrgreco May 19, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions .github/actions/podman-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,20 @@ description: "Sets up Podman"
runs:
using: "composite"
steps:
- name: Podman setup
- name: Install Podman
uses: redhat-actions/podman-install@5bc2ecc87c737059124c295845be51ee7297fb89
with:
ubuntu-repository: questing

- name: Configure Podman
shell: bash
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
podman info
echo "DOCKER_HOST=unix://${XDG_RUNTIME_DIR}/podman/podman.sock" >> $GITHUB_ENV
echo "CI_ROOTLESS=true" >> $GITHUB_ENV
PODMAN_SOCKET="${RUNNER_TEMP:-/tmp}/podman.sock"

sudo mkdir -p /etc/systemd/system/podman.socket.d
printf '[Socket]\nListenStream=\nListenStream=%s\nSocketUser=%s\nSocketMode=0600\n' "${PODMAN_SOCKET}" "$(id -un)" | sudo tee /etc/systemd/system/podman.socket.d/runner.conf
sudo systemctl daemon-reload
sudo systemctl restart podman.socket
podman --url="unix://${PODMAN_SOCKET}" info
echo "DOCKER_HOST=unix://${PODMAN_SOCKET}" >> $GITHUB_ENV
echo "CI_PODMAN=true" >> $GITHUB_ENV
18 changes: 9 additions & 9 deletions .github/workflows/checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -53,15 +53,15 @@ jobs:
fail-fast: false
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@v5
- name: Install Node and Dependencies
id: npm-install-modules
uses: ./.github/actions/npm-setup
with:
runner: ubuntu-22.04
runner: ubuntu-24.04
node-version: 24.x
workspace: "${{ matrix.module }}"
- name: Code linting
Expand All @@ -79,15 +79,15 @@ jobs:
fail-fast: false
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@v5
- name: Install Node and Dependencies
id: npm-install
uses: ./.github/actions/npm-setup
with:
runner: ubuntu-22.04
runner: ubuntu-24.04
node-version: 24.x
workspace: "${{ matrix.module }}"
- name: Compile
Expand All @@ -108,14 +108,14 @@ jobs:
fail-fast: false
matrix:
node-version: [22.x, 24.x]
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Code checkout
uses: actions/checkout@v5
- name: Install Node ${{ matrix.node-version }} and Dependencies
uses: ./.github/actions/npm-setup
with:
runner: ubuntu-22.04
runner: ubuntu-24.04
node-version: ${{ matrix.node-version }}
workspace: "testcontainers"
- name: Build testcontainers
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
container-runtime: [docker, podman]
uses: ./.github/workflows/test-template.yml
with:
runner: ubuntu-22.04
runner: ubuntu-24.04
node-version: ${{ matrix.node-version }}
container-runtime: ${{ matrix.container-runtime }}
workspace: "${{ matrix.module }}"
Expand All @@ -161,7 +161,7 @@ jobs:
- compile
- smoke-test
- test
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Check if any jobs failed
if: ${{ failure() || cancelled() }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/close-inactive-issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
close-issues:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
issues: write
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
actions: read
contents: read
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ permissions:
jobs:
dependency-review:
name: Run
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: "Checkout Repository"
uses: actions/checkout@v5
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
publish:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows-test-command-dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
version: 3

services:
container:
image: cristianrgreco/testcontainer:1.1.14
ports:
- 8080
another-container:
image: cristianrgreco/testcontainer:1.1.14
ports:
- 8080
MALFORMED
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
service-a:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
db:
container_name: ${CONTAINER_NAME:-custom_container_name}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
environment:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.9"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: "3.5"

services:
container:
image: cristianrgreco/testcontainer:1.1.14
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ describe("GenericContainer", { timeout: 180_000 }, () => {
it("should set security options", async () => {
await using container = await new GenericContainer("cristianrgreco/testcontainer:1.1.14")
.withSecurityOpt("no-new-privileges")
.withExposedPorts(8080)
.withCommand(["sleep", "60"])
.start();

const { output } = await container.exec(["sh", "-c", "awk '/^NoNewPrivs:/ { print $2 }' /proc/1/status"]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe("HostPortWaitStrategy", { timeout: 180_000 }, () => {
.withExposedPorts(8081)
.withStartupTimeout(0)
.start()
).rejects.toThrowError(/Port \d+\/(tcp|udp) not bound after 0ms/);
).rejects.toThrowError(/Port \d+(\/(tcp|udp))? not bound after 0ms/);

expect(await getRunningContainerNames()).not.toContain(containerName);
});
Expand Down
Loading