From 66412a75f90e7190911ba94a533ba24a3e339bf4 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Thu, 28 May 2020 09:25:29 +1000 Subject: [PATCH] Revert to node base now that base has openresty --- docker/Dockerfile | 2 +- docker/dev/Dockerfile | 2 +- docker/rootfs/root/.bashrc | 2 +- scripts/frontend-build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index be2a67b4..e3eefb34 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ # This file assumes that the frontend has been built using ./scripts/frontend-build -FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:github-openresty-node +FROM --platform=${TARGETPLATFORM:-linux/amd64} jc21/alpine-nginx-full:node ARG TARGETPLATFORM ARG BUILDPLATFORM diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 042917e9..f0e2d262 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -1,4 +1,4 @@ -FROM jc21/alpine-nginx-full:github-openresty-node +FROM jc21/alpine-nginx-full:node LABEL maintainer="Jamie Curnow " ENV S6_LOGGING=0 diff --git a/docker/rootfs/root/.bashrc b/docker/rootfs/root/.bashrc index fe69b787..aec8e8f9 100644 --- a/docker/rootfs/root/.bashrc +++ b/docker/rootfs/root/.bashrc @@ -16,5 +16,5 @@ alias h='cd ~;clear;' echo -e -n '\E[1;34m' figlet -w 120 "NginxProxyManager" -echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev}\E[1;36m (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}, Nginx \E[1;32m${NGINX_VERSION:-unknown}\E[1;36m, Alpine \E[1;32m${VERSION_ID:-unknown}\E[1;36m, Kernel \E[1;32m$(uname -r)\E[0m" +echo -e "\E[1;36mVersion \E[1;32m${NPM_BUILD_VERSION:-2.0.0-dev} (${NPM_BUILD_COMMIT:-dev}) ${NPM_BUILD_DATE:-0000-00-00}\E[1;36m, OpenResty \E[1;32m${OPENRESTY_VERSION:-unknown}\E[1;36m, Alpine \E[1;32m${VERSION_ID:-unknown}\E[1;36m, Kernel \E[1;32m$(uname -r)\E[0m" echo diff --git a/scripts/frontend-build b/scripts/frontend-build index a94b9a9e..05be2eae 100755 --- a/scripts/frontend-build +++ b/scripts/frontend-build @@ -3,7 +3,7 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" . "$DIR/.common.sh" -DOCKER_IMAGE=jc21/alpine-nginx-full:github-openresty-node +DOCKER_IMAGE=jc21/alpine-nginx-full:node # Ensure docker exists if hash docker 2>/dev/null; then