From cdff8e01ba1740cd38a8a974083cbf821edac985 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Mon, 6 Mar 2023 19:02:58 +0000
Subject: [PATCH] Fix Docker.debian (#360)

* Bump to 3.1.0-beta.2

* Fix GH Action

* Add debug

* Fix variables

* Remove armv6 and s390 from debian build

* Fix path to entrypoint on debian

* More fixes in debian Dockerfile
---
 .docker/Dockerfile.debian  | 5 +++--
 .github/workflows/main.yml | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.debian b/.docker/Dockerfile.debian
index 52d78b89..4124cb1a 100644
--- a/.docker/Dockerfile.debian
+++ b/.docker/Dockerfile.debian
@@ -5,7 +5,8 @@ ARG OS=buster-slim
 FROM node:${NODE_VERSION}-${OS} AS base
 
 # Copy scripts
-COPY scripts/*.sh /tmp/
+COPY .docker/scripts/*.sh /tmp/
+COPY .docker/healthcheck.js /
 
 # Install tools, create Node-RED app and data dir, add user and set rights
 RUN set -ex && \
@@ -96,6 +97,6 @@ ENV NODE_RED_VERSION=$NODE_RED_VERSION \
 EXPOSE 1880
 
 # Add a healthcheck (default every 30 secs)
-HEALTHCHECK CMD curl http://localhost:1880/ || exit 1
+HEALTHCHECK CMD node /healthcheck.js
 
 ENTRYPOINT ["./entrypoint.sh"]
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d088d578..cc6fe732 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -211,7 +211,6 @@ jobs:
       - name: Build and push
         id: build-push
         uses: docker/build-push-action@v2
-        continue-on-error: true
         with:
           context: .
           platforms: linux/amd64, linux/arm64, linux/arm/v7