Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix!: Docker: update Alpine to 3.21, drop x86 support #25171

Merged
merged 59 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
976ea20
fix(ignore): update zigbee-herdsman-converters to 20.39.1
Koenkk Nov 2, 2024
073f266
test
Koenkk Nov 3, 2024
af5a39d
fix(ignore): update zigbee-herdsman-converters to 20.39.2
Koenkk Nov 3, 2024
50d6ca2
u
Koenkk Nov 3, 2024
7170f76
Merge branch 'deps/zigbee-herdsman-converters' into fix/update-alpine
Koenkk Nov 3, 2024
7c873fd
u
Koenkk Nov 3, 2024
6a5b044
Merge branch 'dev' into fix/update-alpine
Koenkk Nov 3, 2024
c0d4194
u
Koenkk Nov 3, 2024
10c4e54
install from apt
Koenkk Nov 3, 2024
83f50a9
u
Koenkk Nov 3, 2024
2486deb
u
Koenkk Nov 3, 2024
da40e99
u
Koenkk Nov 3, 2024
69d48e2
u
Koenkk Nov 3, 2024
478acaf
u
Koenkk Nov 3, 2024
fbd0124
u
Koenkk Nov 3, 2024
285ca0f
u
Koenkk Nov 3, 2024
77b5a31
u
Koenkk Nov 3, 2024
6a712f7
u
Koenkk Nov 3, 2024
b4db796
u
Koenkk Nov 3, 2024
3a1fce5
u
Koenkk Nov 3, 2024
2bf10b1
u
Koenkk Nov 3, 2024
af8a376
u
Koenkk Nov 3, 2024
f0ae5f0
u
Koenkk Nov 3, 2024
c9a878a
u
Koenkk Nov 3, 2024
7fd9485
u
Koenkk Nov 3, 2024
956d963
u
Koenkk Nov 3, 2024
3d06676
u
Koenkk Nov 3, 2024
c3d9b49
u
Koenkk Nov 3, 2024
f83f8d9
u
Koenkk Nov 3, 2024
df2526a
u
Koenkk Nov 3, 2024
ea30854
u
Koenkk Nov 3, 2024
19a61f1
u
Koenkk Nov 3, 2024
c521aa0
u
Koenkk Nov 3, 2024
7004526
Merge remote-tracking branch 'origin/dev' into fix/update-alpine
Koenkk Dec 1, 2024
5b4e1b1
u
Koenkk Dec 1, 2024
817a7fd
update
Koenkk Dec 1, 2024
806fe33
u
Koenkk Dec 1, 2024
5fe9529
u
Koenkk Dec 1, 2024
0a30651
Update Dockerfile
Koenkk Dec 8, 2024
f592026
Update Dockerfile
Koenkk Dec 8, 2024
4db630b
Update Dockerfile
Koenkk Dec 8, 2024
33f1de6
Update Dockerfile
Koenkk Dec 8, 2024
2cc8e12
u
Koenkk Dec 10, 2024
1877c0e
u
Koenkk Dec 10, 2024
0b48505
u
Koenkk Dec 10, 2024
a115157
u
Koenkk Dec 10, 2024
31a3cc3
u
Koenkk Dec 10, 2024
6358bbb
u
Koenkk Dec 10, 2024
6d2dfb4
u
Koenkk Dec 10, 2024
83e930c
u
Koenkk Dec 11, 2024
f83af1d
fix: Fix `Cannot read properties of null (reading 'toString')` when H…
Koenkk Dec 11, 2024
6bde48b
Merge branch 'dev' into fix/event-entities
Koenkk Dec 11, 2024
bf340b5
Merge pull request #25169 from Koenkk/fix/event-entities
Koenkk Dec 11, 2024
4b30a96
u
Koenkk Dec 11, 2024
308ffdb
Merge remote-tracking branch 'origin/dev' into fix/update-alpine
Koenkk Dec 11, 2024
a386e1a
u
Koenkk Dec 11, 2024
b2f1e48
u
Koenkk Dec 11, 2024
08a81d2
Merge remote-tracking branch 'origin/dev' into fix/update-alpine
Koenkk Dec 11, 2024
912d333
u
Koenkk Dec 11, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
with:
context: .
file: docker/Dockerfile
platforms: linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7
platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7
tags: koenkk/zigbee2mqtt:latest-dev,ghcr.io/koenkk/zigbee2mqtt:latest-dev
push: true
build-args: |
Expand All @@ -92,7 +92,7 @@ jobs:
context: .
file: docker/Dockerfile
provenance: false
platforms: linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7
platforms: linux/arm64/v8,linux/amd64,linux/arm/v6,linux/arm/v7
tags: koenkk/zigbee2mqtt:latest,ghcr.io/koenkk/zigbee2mqtt:latest,koenkk/zigbee2mqtt:${{ github.ref_name }},ghcr.io/koenkk/zigbee2mqtt:${{ github.ref_name }}
push: true
build-args: |
Expand Down
12 changes: 10 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
FROM alpine:3.18.4 AS base
ARG TARGETPLATFORM

# Need to use Alpine 3.18.4 which uses Node 18 for arm/v6 and arm/v7, otherwise the build hangs.
# See https://github.com/nodejs/docker-node/issues/2077
FROM alpine:3.18.4 AS arm-alpine
FROM alpine:3.21 AS arm64-alpine
FROM alpine:3.21 AS amd64-alpine

FROM ${TARGETARCH}-alpine AS base

ENV NODE_ENV=production
WORKDIR /app
Expand All @@ -18,7 +26,7 @@ FROM base AS release
ARG DATE
ARG VERSION
LABEL org.opencontainers.image.authors="Koen Kanters"
LABEL org.opencontainers.image.title="zigbee2mqtt"
LABEL org.opencontainers.image.title="Zigbee2MQTT"
LABEL org.opencontainers.image.description="Zigbee to MQTT bridge using Zigbee-herdsman"
LABEL org.opencontainers.image.url="https://github.com/Koenkk/zigbee2mqtt"
LABEL org.opencontainers.image.documentation="https://www.zigbee2mqtt.io/"
Expand Down
Loading