From 5a1c9d925c70a0aa73373047ff37ca9a11fcf276 Mon Sep 17 00:00:00 2001 From: "Alex Ellis (OpenFaaS Ltd)" Date: Mon, 21 Feb 2022 10:32:19 +0000 Subject: [PATCH] Rename nodejs-npm to npm in sample packages The legacy samples should not be used for anything at this point, however this change is needed for the new alpine:3.15 base image. Signed-off-by: Alex Ellis (OpenFaaS Ltd) --- sample-functions/CaptainsIntent/Dockerfile | 2 +- sample-functions/ChangeColorIntent/Dockerfile | 2 +- sample-functions/HostnameIntent/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile | 2 +- sample-functions/NodeInfo/Dockerfile.arm64 | 2 +- sample-functions/NodeInfo/Dockerfile.armhf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sample-functions/CaptainsIntent/Dockerfile b/sample-functions/CaptainsIntent/Dockerfile index 571faaab..67f26169 100644 --- a/sample-functions/CaptainsIntent/Dockerfile +++ b/sample-functions/CaptainsIntent/Dockerfile @@ -1,7 +1,7 @@ FROM ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog FROM alpine:3.15 as ship -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/ChangeColorIntent/Dockerfile b/sample-functions/ChangeColorIntent/Dockerfile index 4abe3a5b..a78e8735 100644 --- a/sample-functions/ChangeColorIntent/Dockerfile +++ b/sample-functions/ChangeColorIntent/Dockerfile @@ -1,7 +1,7 @@ FROM ghcr.io/openfaas/classic-watchdog:0.2.0 as watchdog FROM alpine:3.15 as ship -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY --from=watchdog /fwatchdog /usr/bin/fwatchdog RUN chmod +x /usr/bin/fwatchdog diff --git a/sample-functions/HostnameIntent/Dockerfile b/sample-functions/HostnameIntent/Dockerfile index a1a777cf..ac34b174 100644 --- a/sample-functions/HostnameIntent/Dockerfile +++ b/sample-functions/HostnameIntent/Dockerfile @@ -2,7 +2,7 @@ FROM functions/alpine:latest USER root -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY package.json . COPY handler.js . diff --git a/sample-functions/NodeInfo/Dockerfile b/sample-functions/NodeInfo/Dockerfile index 782bea9b..258e031f 100644 --- a/sample-functions/NodeInfo/Dockerfile +++ b/sample-functions/NodeInfo/Dockerfile @@ -2,7 +2,7 @@ FROM functions/alpine:latest USER root -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY package.json . COPY main.js . diff --git a/sample-functions/NodeInfo/Dockerfile.arm64 b/sample-functions/NodeInfo/Dockerfile.arm64 index f637bc96..ce11f500 100644 --- a/sample-functions/NodeInfo/Dockerfile.arm64 +++ b/sample-functions/NodeInfo/Dockerfile.arm64 @@ -2,7 +2,7 @@ FROM functions/alpine:latest USER root -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY package.json . COPY main.js . diff --git a/sample-functions/NodeInfo/Dockerfile.armhf b/sample-functions/NodeInfo/Dockerfile.armhf index f637bc96..ce11f500 100644 --- a/sample-functions/NodeInfo/Dockerfile.armhf +++ b/sample-functions/NodeInfo/Dockerfile.armhf @@ -2,7 +2,7 @@ FROM functions/alpine:latest USER root -RUN apk --update add nodejs nodejs-npm +RUN apk --update add nodejs npm COPY package.json . COPY main.js .