diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 655c971d11..408351ca6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,7 +59,7 @@ jobs: --build-arg COMMIT=$(git rev-parse --short HEAD) \ --platform linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 \ -f docker/Dockerfile \ - --provenance=false \ + --provenance=max \ --push \ -t koenkk/zigbee2mqtt:latest-dev -t ghcr.io/koenkk/zigbee2mqtt:latest-dev \ . @@ -71,7 +71,7 @@ jobs: --build-arg COMMIT=$(git rev-parse --short HEAD) \ --platform linux/arm64/v8,linux/386,linux/amd64,linux/arm/v6,linux/arm/v7 \ -f docker/Dockerfile \ - --provenance=false \ + --provenance=max \ --push \ -t koenkk/zigbee2mqtt:latest -t "koenkk/zigbee2mqtt:$TAG" -t ghcr.io/koenkk/zigbee2mqtt:latest -t "ghcr.io/koenkk/zigbee2mqtt:$TAG" \ . @@ -147,7 +147,7 @@ jobs: version: 9 - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: ${{ matrix.node }} cache: pnpm - name: Install dependencies # --ignore-scripts prevents the serialport build which often fails on Windows diff --git a/data/configuration.example.yaml b/data/configuration.example.yaml index 1a300ffb24..1a8e2799c7 100644 --- a/data/configuration.example.yaml +++ b/data/configuration.example.yaml @@ -1,3 +1,6 @@ +# Indicates the configuration version (used by configuration migrations) +version: 2 + # Home Assistant integration (MQTT discovery) homeassistant: false diff --git a/docker/Dockerfile b/docker/Dockerfile index 3634363ae9..b517f70577 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -8,7 +8,7 @@ RUN apk add --no-cache tzdata eudev tini nodejs FROM base AS deps COPY package.json pnpm-lock.yaml ./ -RUN apk add npm && \ +RUN apk add make gcc g++ python3 linux-headers npm && \ npm install -g pnpm && \ pnpm install --frozen-lockfile --no-optional @@ -24,7 +24,7 @@ LABEL org.opencontainers.image.source="https://github.com/Koenkk/zigbee2mqtt" COPY --from=deps /app/node_modules ./node_modules COPY dist ./dist -COPY package.json LICENSE index.js data/configuration.yaml data/configuration.example.yaml ./ +COPY package.json LICENSE index.js data/configuration.example.yaml ./ COPY docker/docker-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-entrypoint.sh