From c0c1476dd9dba8b81ede8f0a5ba2a3e4cb0d5765 Mon Sep 17 00:00:00 2001 From: Andrew Min Date: Fri, 1 Dec 2023 09:33:14 -0500 Subject: [PATCH] maintain auth and recovery ports separately --- Dockerfile | 5 +++-- kustomize/resources.yaml | 5 +++++ nginx.conf | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e17a92e..cd36d13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,12 +7,13 @@ LABEL org.opencontainers.image.source https://github.com/tkhq/frames COPY nginx.conf /etc/nginx/nginx.conf -# maintain recovery for backwards compatibility -COPY auth /usr/share/nginx/recovery +# maintain recovery for backwards-compatibility COPY auth /usr/share/nginx/auth +COPY auth /usr/share/nginx/recovery COPY export /usr/share/nginx/export EXPOSE 8080/tcp EXPOSE 8081/tcp +EXPOSE 8082/tcp CMD ["nginx"] diff --git a/kustomize/resources.yaml b/kustomize/resources.yaml index 723e05f..fcb6db6 100644 --- a/kustomize/resources.yaml +++ b/kustomize/resources.yaml @@ -18,6 +18,8 @@ spec: containerPort: 8080 - name: export containerPort: 8081 + - name: recovery + containerPort: 8082 livenessProbe: httpGet: path: /health @@ -43,3 +45,6 @@ spec: - name: http-export port: 8081 targetPort: export + - name: http-recovery + port: 8082 + targetPort: recovery diff --git a/nginx.conf b/nginx.conf index 1a78700..d5b4ae7 100644 --- a/nginx.conf +++ b/nginx.conf @@ -35,7 +35,8 @@ http { # Send access logs to stdout for logging access_log /dev/stdout main; - # Custom server blocks to serve auth and export frames on separate ports + # Custom server blocks to serve auth and export frames on separate ports. + # Maintain recovery and auth separately for now for backwards-compatibility. server { listen 8080; @@ -53,4 +54,9 @@ http { listen 8081; root /usr/share/nginx/export; } + + server { + listen 8082; + root /usr/share/nginx/recovery; + } }