From b81f50dffa9d6e1f0d6a49f95f8b54d9b97cd461 Mon Sep 17 00:00:00 2001 From: kereis Date: Mon, 15 Mar 2021 00:19:18 +0100 Subject: [PATCH 1/2] bugfix(dockerfile): Fix wrongly used Dockerfile for default Docker image See #35 --- .github/workflows/dev-build.yml | 6 +++--- .github/workflows/release.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index ddd13f3..b274f8e 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -72,7 +72,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile + file: ./docker/Dockerfile cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache # push: ${{ github.event_name != 'pull_request' }} @@ -84,7 +84,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile.armhf + file: ./docker/Dockerfile.armhf platforms: linux/arm/v7 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache @@ -97,7 +97,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile.aarch64 + file: ./docker/Dockerfile.aarch64 platforms: linux/arm64/v8 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8095627..7c7f83b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -79,7 +79,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile + file: ./docker/Dockerfile cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache tags: ${{ steps.docker_meta.outputs.tags }} @@ -90,7 +90,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile.armhf + file: ./docker/Dockerfile.armhf platforms: linux/arm/v7 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache @@ -102,7 +102,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./alpine/Dockerfile.aarch64 + file: ./docker/Dockerfile.aarch64 platforms: linux/arm64/v8 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache From 0e7b324310f6d736af2d99320ca4a0c50aa228a3 Mon Sep 17 00:00:00 2001 From: kereis Date: Mon, 15 Mar 2021 00:28:19 +0100 Subject: [PATCH 2/2] refactor(dockerfile): Update maintainer label --- alpine/Dockerfile | 2 +- alpine/Dockerfile.aarch64 | 2 +- alpine/Dockerfile.armhf | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.aarch64 | 2 +- docker/Dockerfile.armhf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alpine/Dockerfile b/alpine/Dockerfile index ba0f30c..3352744 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,5 +1,5 @@ FROM ldez/traefik-certs-dumper:v2.7.0 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " RUN \ apk update && \ diff --git a/alpine/Dockerfile.aarch64 b/alpine/Dockerfile.aarch64 index c6d62a7..5d40048 100644 --- a/alpine/Dockerfile.aarch64 +++ b/alpine/Dockerfile.aarch64 @@ -1,5 +1,5 @@ FROM ldez/traefik-certs-dumper:v2.7.0-arm.v8 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " COPY --from=multiarch/qemu-user-static:x86_64-aarch64 \ /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static diff --git a/alpine/Dockerfile.armhf b/alpine/Dockerfile.armhf index 0c28ce0..68de1fd 100644 --- a/alpine/Dockerfile.armhf +++ b/alpine/Dockerfile.armhf @@ -1,5 +1,5 @@ FROM ldez/traefik-certs-dumper:v2.7.0-arm.v7 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " COPY --from=multiarch/qemu-user-static:x86_64-arm /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static diff --git a/docker/Dockerfile b/docker/Dockerfile index 1ec58c1..4a49015 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,5 @@ FROM docker:19.03.13 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " RUN \ apk update && \ diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 7f407ef..34fb3ca 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -1,5 +1,5 @@ FROM arm64v8/docker:19.03.13 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " COPY --from=multiarch/qemu-user-static:x86_64-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static diff --git a/docker/Dockerfile.armhf b/docker/Dockerfile.armhf index 95917e2..729b19c 100644 --- a/docker/Dockerfile.armhf +++ b/docker/Dockerfile.armhf @@ -1,5 +1,5 @@ FROM arm32v7/docker:19.03.8 -LABEL maintainer="Humenius " +LABEL maintainer="kereis " COPY --from=multiarch/qemu-user-static:x86_64-arm /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static