瀏覽代碼

Revert to node base now that base has openresty

Jamie Curnow 5 年之前
父節點
當前提交
66412a75f9
共有 4 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      docker/Dockerfile
  2. 1 1
      docker/dev/Dockerfile
  3. 1 1
      docker/rootfs/root/.bashrc
  4. 1 1
      scripts/frontend-build

+ 1 - 1
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

+ 1 - 1
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 <[email protected]>"
 
 ENV S6_LOGGING=0

+ 1 - 1
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

+ 1 - 1
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