From 39611bec41b02052a4ba7633d3ad1c9a403bda16 Mon Sep 17 00:00:00 2001
From: mjanez <96422458+mjanez@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:34:46 +0200
Subject: [PATCH] Fix host_ports/ports in Apache/NGINX Dockerfiles

---
 apache/Dockerfile | 8 ++++----
 nginx/Dockerfile  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apache/Dockerfile b/apache/Dockerfile
index bf8bf11..6c81cce 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -1,7 +1,7 @@
 FROM httpd:2.4-alpine
 
-ENV CKAN_PORT_HOST=5000
-ENV PYCSW_PORT_HOST=8000
+ENV CKAN_PORT=5000
+ENV PYCSW_PORT=8000
 ENV PYCSW_CONTAINER_NAME=pycsw
 ENV CKAN_CONTAINER_NAME=ckan
 ENV APACHE_PORT=80
@@ -12,8 +12,8 @@ ENV PROXY_SERVER_NAME=localhost
 
 ENV PROXY_CKAN_LOCATION=/catalog
 ENV PROXY_PYCSW_LOCATION=/csw
-ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
 
 RUN mkdir -p ${APACHE_LOG_DIR}
 
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 8bad6b0..90e9a18 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,14 +1,14 @@
 FROM nginx:stable-alpine
 
-ENV CKAN_PORT_HOST=5000
-ENV PYCSW_PORT_HOST=8000
+ENV CKAN_PORT=5000
+ENV PYCSW_PORT=8000
 ENV PYCSW_CONTAINER_NAME=pycsw
 ENV CKAN_CONTAINER_NAME=ckan
 ENV PROXY_SERVER_NAME=localhost
 ENV PROXY_CKAN_LOCATION=/catalog
 ENV PROXY_PYCSW_LOCATION=/csw
-ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST}
-ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST}
+ENV PROXY_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT}
+ENV PROXY_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT}
 
 ENV NGINX_PORT=80
 ENV NGINX_LOG_DIR=/var/log/nginx