Update Dockerfile paths and add recursive flag for hadolint

hspaans · Dec 26, 2023 · 14eb658 · 14eb658
1 parent c0a10a4
commit 14eb658
Show file tree

Hide file tree

Showing 13 changed files with 218 additions and 2 deletions.
diff --git a/.github/workflows/container-release-debian-10.yml b/.github/workflows/container-release-debian-10.yml
@@ -0,0 +1,43 @@
+---
+name: Container Release (Debian 10)
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "debian-10/Dockerfile"
+      - ".github/workflows/container-release-debian-10.yml"
+  workflow_dispatch:
+
+jobs:
+  build-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: debian-10/Dockerfile
+          tags: ghcr.io/hspaans/molecule-containers:debian-10
diff --git a/.github/workflows/container-release-debian-11.yml b/.github/workflows/container-release-debian-11.yml
@@ -0,0 +1,43 @@
+---
+name: Container Release (Debian 11)
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "debian-11/Dockerfile"
+      - ".github/workflows/container-release-debian-11.yml"
+  workflow_dispatch:
+
+jobs:
+  build-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: debian-11/Dockerfile
+          tags: ghcr.io/hspaans/molecule-containers:debian-11
diff --git a/.github/workflows/container-release-debian-12.yml b/.github/workflows/container-release-debian-12.yml
@@ -0,0 +1,43 @@
+---
+name: Container Release (Debian 12)
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "debian-12/Dockerfile"
+      - ".github/workflows/container-release-debian-12.yml"
+  workflow_dispatch:
+
+jobs:
+  build-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: debian-12/Dockerfile
+          tags: ghcr.io/hspaans/molecule-containers:debian-12
diff --git a/.github/workflows/container-release-ubuntu-2004.yml b/.github/workflows/container-release-ubuntu-2004.yml
@@ -0,0 +1,43 @@
+---
+name: Container Release (Ubuntu 20.04)
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "ubuntu-20.04/Dockerfile"
+      - ".github/workflows/container-release-ubuntu-2004.yml"
+  workflow_dispatch:
+
+jobs:
+  build-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ubuntu-20.04/Dockerfile
+          tags: ghcr.io/hspaans/molecule-containers:ubuntu-20.04
diff --git a/.github/workflows/container-release-ubuntu-2204.yml b/.github/workflows/container-release-ubuntu-2204.yml
@@ -0,0 +1,43 @@
+---
+name: Container Release (Ubuntu 22.04)
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - "ubuntu-22.04/Dockerfile"
+      - ".github/workflows/container-release-ubuntu-2204.yml"
+  workflow_dispatch:
+
+jobs:
+  build-release:
+    name: Build and Release
+    runs-on: ubuntu-latest
+    if: github.ref == 'refs/heads/master'
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Packages Container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: ubuntu-22.04/Dockerfile
+          tags: ghcr.io/hspaans/molecule-containers:ubuntu-22.04
diff --git a/.github/workflows/container-release-ubuntu-2404.yml b/.github/workflows/container-release-ubuntu-2404.yml
@@ -6,7 +6,7 @@ on:
     branches:
       - master
     paths:
-      - "Dockerfile.ubuntu-24.04"
+      - "ubuntu-24.04/Dockerfile"
       - ".github/workflows/container-release-ubuntu-2404.yml"
   workflow_dispatch:
 
@@ -39,5 +39,5 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           push: true
-          file: Dockerfile.ubuntu-24.04
+          file: ubuntu-24.04/Dockerfile
           tags: ghcr.io/hspaans/molecule-containers:ubuntu-24.04
diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml
@@ -36,6 +36,7 @@ jobs:
         uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf
         with:
           dockerfile: ./Dockerfile
+          recursive: true
           format: sarif
           output-file: hadolint-results.sarif
           no-fail: true

diff --git a/Dockerfile.debian-10 → debian-10/Dockerfile b/Dockerfile.debian-10 → debian-10/Dockerfile
diff --git a/Dockerfile.debian-11 → debian-11/Dockerfile b/Dockerfile.debian-11 → debian-11/Dockerfile
diff --git a/Dockerfile.debian-12 → debian-12/Dockerfile b/Dockerfile.debian-12 → debian-12/Dockerfile
diff --git a/Dockerfile.ubuntu-20.04 → ubuntu-20.04/Dockerfile b/Dockerfile.ubuntu-20.04 → ubuntu-20.04/Dockerfile
diff --git a/Dockerfile.ubuntu-22.04 → ubuntu-22.04/Dockerfile b/Dockerfile.ubuntu-22.04 → ubuntu-22.04/Dockerfile
diff --git a/Dockerfile.ubuntu-24.04 → ubuntu-24.04/Dockerfile b/Dockerfile.ubuntu-24.04 → ubuntu-24.04/Dockerfile