Skip to content

Commit ac15a51

Browse files
authored
Bump Alpine to 3.22 and use locked pnpm version (#787)
1 parent f125987 commit ac15a51

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

common/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ RUN apk add --no-cache socat tini nodejs eudev
1010
FROM base as dependencies_and_build
1111

1212
RUN apk add --no-cache --virtual .buildtools npm make gcc g++ linux-headers udev git python3 && \
13-
npm install -g pnpm@10.4.1 && \
1413
if [ "${BUILD_VERSION}" = "edge" ]; \
1514
then \
1615
echo "Installing Edge version" && \
@@ -29,6 +28,7 @@ RUN apk add --no-cache --virtual .buildtools npm make gcc g++ linux-headers udev
2928
fi; \
3029
echo "Installed Zigbee2MQTT @ version $(cat /app/dist/.hash)" && \
3130
cd /app && \
31+
npm install -g pnpm@$(sed -n 's/.*"packageManager": "pnpm@\([0-9.]*\)".*/\1/p' package.json) && \
3232
pnpm install --frozen-lockfile --no-optional --unsafe-perm && \
3333
pnpm run build && \
3434
rm -rf node_modules && \

common/build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
build_from:
2-
aarch64: ghcr.io/home-assistant/aarch64-base:3.21
3-
amd64: ghcr.io/home-assistant/amd64-base:3.21
4-
i386: ghcr.io/home-assistant/i386-base:3.21
5-
armhf: ghcr.io/home-assistant/armhf-base:3.21
6-
armv7: ghcr.io/home-assistant/armv7-base:3.21
2+
aarch64: ghcr.io/home-assistant/aarch64-base:3.22
3+
amd64: ghcr.io/home-assistant/amd64-base:3.22
4+
i386: ghcr.io/home-assistant/i386-base:3.22
5+
armhf: ghcr.io/home-assistant/armhf-base:3.22
6+
armv7: ghcr.io/home-assistant/armv7-base:3.22

0 commit comments

Comments
 (0)