From 6368c39ef72bb6ed0e19f178571211106fdb6ad8 Mon Sep 17 00:00:00 2001
From: Nick Craig <nick.craig@owenscorning.com>
Date: Thu, 10 Mar 2022 16:14:07 -0500
Subject: [PATCH] merging changes

---
 backend/templates/proxy_host.conf                 |  3 ++-
 docker/Dockerfile                                 | 14 +++++++-------
 docker/rootfs/etc/nginx/conf.d/include/proxy.conf |  2 +-
 frontend/fonts/feather                            |  1 -
 frontend/images                                   |  1 -
 frontend/js/i18n/messages.json                    |  3 ++-
 frontend/package.json                             |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 120000 frontend/fonts/feather
 delete mode 120000 frontend/images

diff --git a/backend/templates/proxy_host.conf b/backend/templates/proxy_host.conf
index ffed08b7..b538a0a0 100644
--- a/backend/templates/proxy_host.conf
+++ b/backend/templates/proxy_host.conf
@@ -64,7 +64,8 @@ proxy_http_version 1.1;
     {% endif %}
 
     {% endif %}
-
+    #do the proxy!
+    proxy_pass       $forward_scheme://$server:$port$request_uri;
   }
 {% endif %}
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 7e0c4924..400e94fb 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 owenscorning/aws-nginx-full:certbot-node
+FROM 413067109875.dkr.ecr.us-east-1.amazonaws.com/owenscorning/aws-nginx-full:certbot-node
 
 ARG TARGETPLATFORM
 ARG BUILD_VERSION
@@ -18,12 +18,12 @@ ENV SUPPRESS_NO_CONFIG_WARNING=1 \
 	NPM_BUILD_COMMIT="${BUILD_COMMIT}" \
 	NPM_BUILD_DATE="${BUILD_DATE}"
 
-RUN yum makecache \
-	&& yum install -y \
-	jq logrotate \
-	\
-	&& yum clean all \
-	&& rm -rf /var/cache/* /var/log/* /tmp/*
+RUN echo "fs.file-max = 65535" > /etc/sysctl.conf \
+	&& apt-get update \
+	&& apt-get upgrade -y \
+	&& apt-get install -y --no-install-recommends jq logrotate \
+	&& apt-get clean \
+	&& rm -rf /var/lib/apt/lists/*
 
 # s6 overlay
 COPY scripts/install-s6 /tmp/install-s6
diff --git a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
index e6f9ee16..9618208a 100644
--- a/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
+++ b/docker/rootfs/etc/nginx/conf.d/include/proxy.conf
@@ -3,5 +3,5 @@ proxy_set_header X-Forwarded-Scheme $scheme;
 proxy_set_header X-Forwarded-Proto  $scheme;
 proxy_set_header X-Forwarded-For    $remote_addr;
 proxy_set_header X-Real-IP          $remote_addr;
-proxy_pass       $forward_scheme://$server:$port$request_uri;
+
 
diff --git a/frontend/fonts/feather b/frontend/fonts/feather
deleted file mode 120000
index 440203ba..00000000
--- a/frontend/fonts/feather
+++ /dev/null
@@ -1 +0,0 @@
-../node_modules/tabler-ui/dist/assets/fonts/feather
\ No newline at end of file
diff --git a/frontend/images b/frontend/images
deleted file mode 120000
index 37c31854..00000000
--- a/frontend/images
+++ /dev/null
@@ -1 +0,0 @@
-./node_modules/tabler-ui/dist/assets/images
\ No newline at end of file
diff --git a/frontend/js/i18n/messages.json b/frontend/js/i18n/messages.json
index 896a9633..180508fe 100644
--- a/frontend/js/i18n/messages.json
+++ b/frontend/js/i18n/messages.json
@@ -133,7 +133,8 @@
       "allow-websocket-upgrade": "Websockets Support",
       "ignore-invalid-upstream-ssl": "Ignore Invalid SSL",
       "custom-forward-host-help": "Add a path for sub-folder forwarding.\nExample: 203.0.113.25/path",
-      "search": "Search Host…"
+      "search": "Search Host…",
+      "forward-proxy-header": "Forward Hostname"
     },
     "redirection-hosts": {
       "title": "Redirection Hosts",
diff --git a/frontend/package.json b/frontend/package.json
index 198e6c93..7fd50b13 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nginx-proxy-manager",
-  "version": "0.0.0",
+  "version": "2.9.16",
   "description": "A beautiful interface for creating Nginx endpoints",
   "main": "js/index.js",
   "devDependencies": {