From 54823bed25d1f53b790422789bf5226e891b04b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20Milo=C5=A1evi=C4=87?= Date: Thu, 25 Jul 2019 17:15:06 +0200 Subject: [PATCH] NOISSUE - Fix building UI docker image for arm (#806) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add entrypoint in arm Dockerfile Switch from ash to dash in entrypoint script Signed-off-by: Ivan Milošević * Add new line on file end Signed-off-by: Ivan Milošević --- ui/docker/Dockerfile.arm | 3 +++ ui/docker/entrypoint.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/docker/Dockerfile.arm b/ui/docker/Dockerfile.arm index 9a7600a0..f8ed8f34 100644 --- a/ui/docker/Dockerfile.arm +++ b/ui/docker/Dockerfile.arm @@ -22,3 +22,6 @@ COPY --from=builder /app/main.js /usr/share/nginx/html COPY --from=builder /app/css/mainflux.css /usr/share/nginx/html/css/ COPY --from=builder /app/src/Websocket.js /usr/share/nginx/html/src/ COPY --from=builder /app/docker/nginx.conf /etc/nginx/conf.d/default.conf +COPY docker/entrypoint.sh /entrypoint.sh + +ENTRYPOINT ["/entrypoint.sh"] diff --git a/ui/docker/entrypoint.sh b/ui/docker/entrypoint.sh index cc402807..26a282d6 100755 --- a/ui/docker/entrypoint.sh +++ b/ui/docker/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/ash +#!/bin/sh if [ -n "$MF_UI_PORT" ]; then sed -i -e "s/MF_UI_PORT/$MF_UI_PORT/" /etc/nginx/conf.d/default.conf