From 7b93c2872a1c2876da25875cf575e8b290c94bac Mon Sep 17 00:00:00 2001 From: scyto Date: Mon, 22 Feb 2021 00:22:27 -0800 Subject: [PATCH] chore(docker): fixed dockerfile and dockerfile.contrib to use node:erbium-buster-slim (#666) * bug: use node:erbium-buster-slim in FROM; revert dependabot changes. dependabot reverted the base image to alpine this PR changes it back to node:erbium-buster-slim * bug: revert node.alpine to node:erbium-buster-slim * Update Dockerfile reverted dockerfile to 15.9.0-alpine * Update Dockerfile.contrib change git clone section to use erbium-buster not erbium-buster-slim * Update Dockerfile.contrib change buster-slim to buster * Update Dockerfile.contrib put slim back after testing --- docker/Dockerfile.contrib | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.contrib b/docker/Dockerfile.contrib index c716a7f11f8..4e1b9c8e794 100644 --- a/docker/Dockerfile.contrib +++ b/docker/Dockerfile.contrib @@ -3,16 +3,17 @@ ARG SRC=git-clone-src ##### GIT CLONE ##### -FROM node:15.9.0-alpine AS git-clone-src +FROM node:erbium-buster AS git-clone-src ARG ZWJ_BRANCH=master ARG Z2M_BRANCH=master USER node WORKDIR /home/node + RUN git clone -b ${ZWJ_BRANCH} --depth 1 https://github.com/zwave-js/node-zwave-js RUN git clone -b ${Z2M_BRANCH} --depth 1 https://github.com/zwave-js/zwavejs2mqtt ##### LOCAL SOURCE ##### -FROM node:15.9.0-alpine AS local-copy-src +FROM node:erbium-buster-slim AS local-copy-src COPY --chown=node node-zwave-js /home/node/node-zwave-js COPY --chown=node zwavejs2mqtt /home/node/zwavejs2mqtt @@ -51,7 +52,7 @@ RUN yarn link zwave-js @zwave-js/core @zwave-js/config @zwave-js/serial @zwave-j RUN mkdir my_dist RUN cp -Lr .git app.js package.json bin config dist hass lib public store views node_modules my_dist/ -FROM node:15.9.0-alpine +FROM node:erbium-buster-slim LABEL maintainer="robertsLando" RUN apt-get update && apt-get install -y git && rm -rf /var/lib/apt/lists/* COPY --from=build /home/node/zwavejs2mqtt/my_dist /usr/src/app