Skip to content

Commit

Permalink
Merge pull request #36 from kereis/bugfix/#35-wrong-dockerfile
Browse files Browse the repository at this point in the history
Fix wrongly used Dockerfile for default Docker image
  • Loading branch information
kereis authored Mar 14, 2021
2 parents 5c03bd9 + 0e7b324 commit d2f15d1
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ldez/traefik-certs-dumper:v2.7.0
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

RUN \
apk update && \
Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ldez/traefik-certs-dumper:v2.7.0-arm.v8
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

COPY --from=multiarch/qemu-user-static:x86_64-aarch64 \
/usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static
Expand Down
2 changes: 1 addition & 1 deletion alpine/Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ldez/traefik-certs-dumper:v2.7.0-arm.v7
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

COPY --from=multiarch/qemu-user-static:x86_64-arm /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM docker:19.03.13
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

RUN \
apk update && \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM arm64v8/docker:19.03.13
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

COPY --from=multiarch/qemu-user-static:x86_64-aarch64 /usr/bin/qemu-aarch64-static /usr/bin/qemu-aarch64-static

Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM arm32v7/docker:19.03.8
LABEL maintainer="Humenius <[email protected]>"
LABEL maintainer="kereis <[email protected]>"

COPY --from=multiarch/qemu-user-static:x86_64-arm /usr/bin/qemu-arm-static /usr/bin/qemu-arm-static

Expand Down

0 comments on commit d2f15d1

Please sign in to comment.