From c05cdaddab01d85e1f25e6eb2b851dcc4690dfcd Mon Sep 17 00:00:00 2001 From: Andreas Olsson Date: Sat, 27 Jan 2024 14:32:05 +0100 Subject: [PATCH 1/3] Switch to newish Super-Linter upstream --- .github/workflows/lint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 1a790a2..604ff50 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -21,7 +21,7 @@ jobs: fetch-depth: 0 - name: Run Super-Linter - uses: github/super-linter/slim@v5 + uses: super-linter/super-linter/slim@v5 env: VALIDATE_ALL_CODEBASE: true VALIDATE_NATURAL_LANGUAGE: false From 6aa1aa8c3e6d243bd0e21aa68e7b701bbaa46e1f Mon Sep 17 00:00:00 2001 From: Andreas Olsson Date: Sat, 27 Jan 2024 14:33:42 +0100 Subject: [PATCH 2/3] Bump major versions on Docker actions --- .github/workflows/publish.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 88c504e..7df45f9 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -37,14 +37,14 @@ jobs: echo "RELEASE=$ZMREL" >> "$GITHUB_ENV" - name: Login to GHCR - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: pull: true push: true From f4360ac21195c1d7c9a29fd52a87edf800e82f65 Mon Sep 17 00:00:00 2001 From: Andreas Olsson Date: Sat, 27 Jan 2024 15:02:25 +0100 Subject: [PATCH 3/3] Rebuild on top of Ubuntu 23.10 base image --- .github/workflows/publish.yaml | 2 +- Dockerfile | 2 +- README.md | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 7df45f9..d418eaa 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest env: - ZMREL: 2023.1.4-1 + ZMREL: 2023.1.4-2 steps: - name: Check out repository diff --git a/Dockerfile b/Dockerfile index 5dbdd0f..fb74fb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:23.04 +FROM ubuntu:23.10 LABEL org.opencontainers.image.source="https://github.com/andreaso/zonemaster-image" RUN apt-get update \ && apt-get install --yes --no-install-recommends \ diff --git a/README.md b/README.md index 3e3feca..90d4111 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ for the Zonemaster project. ## Usage ```shell -docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-1 --help +docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-2 --help ``` ```shell -docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --network=host --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-1 DOMAIN +docker run --rm --user=4848 --cap-drop=all --security-opt=no-new-privileges --read-only --network=host --tty ghcr.io/andreaso/zonemaster-cli:2023.1.4-2 DOMAIN ``` (Suggesting `--network=host` since it's more likely to have IPv6 connectivity by default.)