From 89015c72a436fa72d78d01e4e613506ea06f1e3f Mon Sep 17 00:00:00 2001
From: Stefan Obermeier <st.obermeier@seeburger.de>
Date: Fri, 31 Jan 2025 22:51:57 +0100
Subject: [PATCH 1/2] Remove nginx default.conf SP 0.93.0 -> 0.95.0 migration
 code

Fixes #3446
---
 ui/Dockerfile           | 8 --------
 ui/docker-entrypoint.sh | 7 -------
 2 files changed, 15 deletions(-)

diff --git a/ui/Dockerfile b/ui/Dockerfile
index a6b1c6aa74..93d2a1f48d 100644
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@@ -17,14 +17,6 @@ FROM nginx:mainline-alpine3.18
 
 COPY dist/streampipes/ui/browser/ /usr/share/nginx/html/
 
-#Store a copy to have a version if the other is hidden in the volume. Required for migration from 0.93.0 to 0.95.0. Could be removed after the release of 0.95.0.
-RUN mkdir -p /etc/opt/nginx/
-RUN chown -R nginx:nginx /etc/opt/nginx/
-COPY nginx_config/default.conf.template /etc/opt/nginx/default.conf.template
-RUN chown -R nginx:nginx  /etc/opt/nginx/default.conf.template
-
-
-
 RUN chown -R nginx:nginx /usr/share/nginx/html && chmod -R 755 /usr/share/nginx/html && \
         chown -R nginx:nginx /var/cache/nginx && \
         chown -R nginx:nginx /var/log/nginx && \
diff --git a/ui/docker-entrypoint.sh b/ui/docker-entrypoint.sh
index 1e8c325359..31e2c07998 100755
--- a/ui/docker-entrypoint.sh
+++ b/ui/docker-entrypoint.sh
@@ -27,13 +27,6 @@ elif [ ! -z "$SP_HTTP_SERVER_ADAPTER_ENDPOINT" ]; then
         cp /etc/nginx/conf.d/default.conf $DEFAULT_CONF_BACKUP
     fi
 
-    # Required for migration from 0.93.0 to 0.95.0. Could be removed after the release of 0.95.0.
-    if [ ! -f /etc/nginx/conf.d/default.conf.template ]
-    then
-        echo "Migrate to new nginx template"
-        cp /etc/opt/nginx/default.conf.template /etc/nginx/conf.d/default.conf.template
-    fi
-
     rm  -f /etc/nginx/conf.d/default.conf
     envsubst '\$SP_HTTP_SERVER_ADAPTER_ENDPOINT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 fi

From 650d4fec015d4a0809c9a80071b72bb80125d7db Mon Sep 17 00:00:00 2001
From: Stefan Obermeier <obermeier@apache.org>
Date: Fri, 31 Jan 2025 23:57:11 +0100
Subject: [PATCH 2/2] Remove default.conf backup function

---
 ui/docker-entrypoint.sh | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ui/docker-entrypoint.sh b/ui/docker-entrypoint.sh
index 31e2c07998..1db5151d85 100755
--- a/ui/docker-entrypoint.sh
+++ b/ui/docker-entrypoint.sh
@@ -19,16 +19,8 @@ if [ ! -z "$NGINX_SSL" ] && [ "$NGINX_SSL" = "true" ]; then
     rm /etc/nginx/conf.d/default.conf
     ln -s /app/nginx-confs/ssl.conf /etc/nginx/conf.d/default.conf
 elif [ ! -z "$SP_HTTP_SERVER_ADAPTER_ENDPOINT" ]; then
-
-    if [ ! -f /etc/nginx/conf.d/default.conf ]
-    then
-        DEFAULT_CONF_BACKUP="/etc/nginx/conf.d/default.conf_$(date +%s).bak"
-        echo "Create backup of old configuration $DEFAULT_CONF_BACKUP"
-        cp /etc/nginx/conf.d/default.conf $DEFAULT_CONF_BACKUP
-    fi
-
     rm  -f /etc/nginx/conf.d/default.conf
     envsubst '\$SP_HTTP_SERVER_ADAPTER_ENDPOINT' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf
 fi
 
-exec "$@"
\ No newline at end of file
+exec "$@"