From 107471b162e4527517a3b1761086b065a91627b2 Mon Sep 17 00:00:00 2001 From: AlCalzone Date: Sun, 10 Jan 2021 13:48:43 +0100 Subject: [PATCH] fix: use yarn link instead of yalc in Dockerfile.contrib (#181) * fix: use yarn link instead of yalc * fix: @zwave-js/core should not need to be linked I think * fix: link all packages --- docker/Dockerfile.contrib | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docker/Dockerfile.contrib b/docker/Dockerfile.contrib index 16410f4b56c..1da6da818a0 100644 --- a/docker/Dockerfile.contrib +++ b/docker/Dockerfile.contrib @@ -18,7 +18,6 @@ COPY --chown=node zwavejs2mqtt /home/node/zwavejs2mqtt FROM ${SRC} AS build ARG YARN_NETWORK_TIMEOUT=30000 USER root -RUN yarn global add yalc RUN apt-get update && apt-get install -y jq USER node WORKDIR /home/node/node-zwave-js @@ -30,26 +29,21 @@ RUN for i in config core serial shared; do \ cd packages/$i && \ yarn version --no-git-tag-version --new-version $(yarn versions --json| \ jq -r '[.data."@zwave-js/'${i}'"]'[0])-$(git rev-parse --short HEAD) && \ - yalc publish && \ + yarn link && \ cd ../..; \ done RUN cd packages/zwave-js && \ yarn version --no-git-tag-version --new-version $(yarn versions --json| \ jq -r '[.data."zwave-js"]'[0])-$(git rev-parse --short HEAD) && \ - yalc publish + yarn link WORKDIR /home/node/zwavejs2mqtt -RUN rm -f package-lock.json -RUN yalc add zwave-js && \ - yalc add @zwave-js/config && \ - yalc add @zwave-js/core && \ - yalc add @zwave-js/shared && \ - yalc add @zwave-js/serial RUN yarn install --network-timeout=${YARN_NETWORK_TIMEOUT} RUN yarn run build RUN yarn install --production --frozen-lockfile RUN yarn version -s --no-git-tag-version --new-version $(yarn versions --json| \ jq -r .data.zwavejs2mqtt)+$(git rev-parse --short HEAD) +RUN yarn link zwave-js @zwave-js/core @zwave-js/config @zwave-js/serial @zwave-js/shared RUN mkdir my_dist RUN cp -Lr .git app.js package.json bin config dist hass lib public store views node_modules my_dist/