Skip to content

Commit

Permalink
Fix GladysAssistant#821 - Switch to eudev instead of udev to fix usb …
Browse files Browse the repository at this point in the history
…service (GladysAssistant#822)

* Switch to correct package eudev to fix usb service

* Adding eudev as sys deps

* remove eudev from build deps

* Update Dockerfile.buildx

Keep DockerFile consistent

Co-authored-by: Pierre-Gilles Leymarie <pierregilles.leymarie@gmail.com>
  • Loading branch information
2 people authored and NickDub committed Aug 7, 2020
1 parent 7b72f3c commit fcf547d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ LABEL \
COPY qemu-* /usr/bin/

# System dependencies
RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip
RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip eudev

WORKDIR /tmp

# Install OZW in a dedicated RUN to benefit from Docker cache on local dev'
RUN apk add --no-cache --virtual .build-deps make g++ git udev coreutils \
RUN apk add --no-cache --virtual .build-deps make g++ git coreutils \
# Install OZW 1.6 - Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020
&& git clone https://github.com/OpenZWave/open-zwave.git \
&& cd open-zwave \
Expand All @@ -32,7 +32,7 @@ WORKDIR /src
ADD . /src
COPY ./static /src/server/static
WORKDIR /src/server
RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers udev \
RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers \
&& npm ci --unsafe-perm --production \
&& npm cache clean --force \
&& apk del .build-deps
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile.buildx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM node:lts-alpine as gladys

# System dependencies
RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip
RUN apk add --no-cache tzdata nmap ffmpeg sqlite openssl gzip eudev

WORKDIR /tmp

# Install OZW in a dedicated RUN to benefit from Docker cache on local dev'
RUN apk add --no-cache --virtual .build-deps make g++ git udev coreutils \
RUN apk add --no-cache --virtual .build-deps make g++ git coreutils \
# Install OZW 1.6 - Commit 5d18bbfb21d8cdc61ee6baae6f478c963297dfc5 - March, 5th 2020
&& git clone https://github.com/OpenZWave/open-zwave.git \
&& cd open-zwave \
Expand All @@ -23,7 +23,7 @@ ADD . /src
COPY ./static /src/server/static
WORKDIR /src/server

RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers udev \
RUN apk add --no-cache --virtual .build-deps make gcc g++ python git libffi-dev linux-headers \
&& npm ci --unsafe-perm --production \
&& npm cache clean --force \
&& apk del .build-deps
Expand Down

0 comments on commit fcf547d

Please sign in to comment.