Skip to content

Commit

Permalink
fix(ignore): some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Koenkk committed Dec 1, 2024
1 parent 23d8cea commit cc61f67
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
.
Expand All @@ -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" \
.
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions data/configuration.example.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Indicates the configuration version (used by configuration migrations)
version: 2

# Home Assistant integration (MQTT discovery)
homeassistant: false

Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down

0 comments on commit cc61f67

Please sign in to comment.