This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/streampipes.git
The following commit(s) were added to refs/heads/dev by this push:
new 30d1ef3128 [#3446] Remove nginx default.conf SP 0.93.0 -> 0.95.0
migration code (#3455)
30d1ef3128 is described below
commit 30d1ef312802d1a4c3588371e4748a687d918e45
Author: Stefan Obermeier <[email protected]>
AuthorDate: Wed Feb 12 16:52:54 2025 +0100
[#3446] Remove nginx default.conf SP 0.93.0 -> 0.95.0 migration code (#3455)
* Remove nginx default.conf SP 0.93.0 -> 0.95.0 migration code
Fixes #3446
* Remove default.conf backup function
---
ui/Dockerfile | 8 --------
ui/docker-entrypoint.sh | 17 +----------------
2 files changed, 1 insertion(+), 24 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..1db5151d85 100755
--- a/ui/docker-entrypoint.sh
+++ b/ui/docker-entrypoint.sh
@@ -19,23 +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
-
- # 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
-exec "$@"
\ No newline at end of file
+exec "$@"
