From 9f65eb40418bbf59b2edb7b4f4ed8a1b4e1e9cd0 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Fri, 19 Jul 2024 08:46:37 +0100 Subject: [PATCH 1/2] Add iputils-ping to the base packages --- .docker/Dockerfile.debian | 3 ++- docker-custom/Dockerfile.debian | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.docker/Dockerfile.debian b/.docker/Dockerfile.debian index 48ae21e8..cd649c63 100644 --- a/.docker/Dockerfile.debian +++ b/.docker/Dockerfile.debian @@ -19,7 +19,8 @@ RUN set -ex && \ git \ openssl \ openssh-client \ - ca-certificates && \ + ca-certificates \ + iputils-ping && \ mkdir -p /usr/src/node-red /data && \ deluser --remove-home node && \ # adduser --home /usr/src/node-red --disabled-password --no-create-home node-red --uid 1000 && \ diff --git a/docker-custom/Dockerfile.debian b/docker-custom/Dockerfile.debian index 5f067aa5..b5c65509 100644 --- a/docker-custom/Dockerfile.debian +++ b/docker-custom/Dockerfile.debian @@ -20,7 +20,8 @@ RUN set -ex && \ git \ openssl \ openssh-client \ - ca-certificates && \ + ca-certificates \ + iputils-ping && \ mkdir -p /usr/src/node-red /data && \ deluser --remove-home node && \ # adduser --home /usr/src/node-red --disabled-password --no-create-home node-red --uid 1000 && \ From 824af9d28694909f654059adb22e8202d318e5ea Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Sun, 22 Sep 2024 21:48:24 +0100 Subject: [PATCH 2/2] Fix case on final build stage closes #450 --- .docker/Dockerfile.alpine | 2 +- .docker/Dockerfile.debian | 2 +- docker-custom/Dockerfile.custom | 2 +- docker-custom/Dockerfile.debian | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine index a3f627f7..b2458977 100644 --- a/.docker/Dockerfile.alpine +++ b/.docker/Dockerfile.alpine @@ -52,7 +52,7 @@ RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python cp -R node_modules prod_node_modules #### Stage RELEASE ##################################################################################################### -FROM base AS RELEASE +FROM base AS release ARG BUILD_DATE ARG BUILD_VERSION ARG BUILD_REF diff --git a/.docker/Dockerfile.debian b/.docker/Dockerfile.debian index cd649c63..b681a26c 100644 --- a/.docker/Dockerfile.debian +++ b/.docker/Dockerfile.debian @@ -53,7 +53,7 @@ RUN apt-get update && apt-get install -y build-essential python && \ cp -R node_modules prod_node_modules #### Stage RELEASE ##################################################################################################### -FROM base AS RELEASE +FROM base AS release ARG BUILD_DATE ARG BUILD_VERSION ARG BUILD_REF diff --git a/docker-custom/Dockerfile.custom b/docker-custom/Dockerfile.custom index f412b73b..fd761bbe 100644 --- a/docker-custom/Dockerfile.custom +++ b/docker-custom/Dockerfile.custom @@ -52,7 +52,7 @@ RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python cp -R node_modules prod_node_modules #### Stage RELEASE ##################################################################################################### -FROM base AS RELEASE +FROM base AS release ARG BUILD_DATE ARG BUILD_VERSION ARG BUILD_REF diff --git a/docker-custom/Dockerfile.debian b/docker-custom/Dockerfile.debian index b5c65509..49767cc3 100644 --- a/docker-custom/Dockerfile.debian +++ b/docker-custom/Dockerfile.debian @@ -54,7 +54,7 @@ RUN apt-get update && apt-get install -y build-essential python && \ cp -R node_modules prod_node_modules #### Stage RELEASE ##################################################################################################### -FROM base AS RELEASE +FROM base AS release ARG BUILD_DATE ARG BUILD_VERSION ARG BUILD_REF