allow package-lock, config-ui 4.30.0

homebridge · Oct 21, 2020 · b717ecd · b717ecd
1 parent 6ba256b
commit b717ecd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,6 @@ RUN apk add --no-cache git python2 python3 make g++ avahi-compat-libdns_sd avahi
   && chmod 4755 /bin/ping \
   && mkdir /homebridge \
   && npm set global-style=true \
-  && npm set package-lock=false \
   && npm set audit=false \ 
   && npm set fund=false
 
@@ -25,7 +24,7 @@ ENV PATH="${PATH}:/homebridge/node_modules/.bin"
 ENV HOMEBRIDGE_VERSION=1.2.3
 RUN npm install -g --unsafe-perm homebridge@${HOMEBRIDGE_VERSION}
 
-ENV CONFIG_UI_VERSION=4.28.1 HOMEBRIDGE_CONFIG_UI=0 HOMEBRIDGE_CONFIG_UI_PORT=8080
+ENV CONFIG_UI_VERSION=4.30.0 HOMEBRIDGE_CONFIG_UI=0 HOMEBRIDGE_CONFIG_UI_PORT=8080
 RUN npm install -g --unsafe-perm homebridge-config-ui-x@${CONFIG_UI_VERSION}
 
 WORKDIR /homebridge

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -9,7 +9,6 @@ RUN apt-get update \
   && chmod 4755 /bin/ping \
   && mkdir /homebridge \
   && npm set global-style=true \
-  && npm set package-lock=false \
   && npm set audit=false \ 
   && npm set fund=false
 
@@ -27,7 +26,7 @@ ENV PATH="${PATH}:/homebridge/node_modules/.bin"
 ENV HOMEBRIDGE_VERSION=1.2.3
 RUN npm install -g --unsafe-perm homebridge@${HOMEBRIDGE_VERSION}
 
-ENV CONFIG_UI_VERSION=4.28.1 HOMEBRIDGE_CONFIG_UI=0 HOMEBRIDGE_CONFIG_UI_PORT=8080
+ENV CONFIG_UI_VERSION=4.30.0 HOMEBRIDGE_CONFIG_UI=0 HOMEBRIDGE_CONFIG_UI_PORT=8080
 RUN npm install -g --unsafe-perm homebridge-config-ui-x@${CONFIG_UI_VERSION}
 
 WORKDIR /homebridge

diff --git a/root/etc/cont-init.d/50-plugins b/root/etc/cont-init.d/50-plugins
@@ -2,13 +2,6 @@
 
 /usr/bin/container-credits-banner
 
-# check to see if plugins were installed using the non-"global-style"
-if [ -e /homebridge/package-lock.json ]; then
-  echo "Converting /homebridge/node_modules to global style..."
-  rm -rf /homebridge/node_modules
-  rm -rf /homebridge/package-lock.json
-fi
-
 # install plugins defined in the package.json file, prune others.
 echo "Homebridge: Installing plugins..."
 npm prune