From 154a12c6f6c8a0092e75df1254d4ae3bd8dc7645 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 1 Feb 2024 20:00:39 +0100 Subject: [PATCH] docker --- Dockerfile | 2 +- build-docker.sh | 5 +---- nginx.conf | 34 +--------------------------------- 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index eb7eec8..c70725f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:latest +FROM nginx:1.25.3-alpine COPY ./build /usr/share/nginx/html COPY ./nginx.conf /etc/nginx/conf.d/default.conf \ No newline at end of file diff --git a/build-docker.sh b/build-docker.sh index 6974fb1..b8420f5 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -1,8 +1,5 @@ -### -# TODO: CHANGE THESE VALUES TO CUSTOMER DASHBAORD !!! - DOCKER_REGISTRY_URL="dockreg.ex.umbach.dev" -DOCKER_IMAGE_NAME="jnx-admin-dashboard-proxy" +DOCKER_IMAGE_NAME="zeitadler-dashboard-web" # only allow to run this script as root if [ "$EUID" -ne 0 ] diff --git a/nginx.conf b/nginx.conf index 0a812a6..7ad2d27 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,39 +4,7 @@ server { location /api/ { # api server client_max_body_size 0; proxy_http_version 1.0; - proxy_pass http://jnx-admin-dashboard-server/; - } - - location /ws { # websocket server - proxy_read_timeout 10800s; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "Upgrade"; - proxy_set_header Host $host; - proxy_pass http://jnx-admin-dashboard-server/ws/; - proxy_http_version 1.1; - } - - location /lm/ { # log manager server - client_max_body_size 0; - proxy_http_version 1.0; - proxy_set_header Connection ""; # needed for sse - proxy_pass http://jnx-log-manager-server/; - } - - location /tm/ { # telegram bot manager - client_max_body_size 0; - proxy_http_version 1.0; - proxy_set_header Connection ""; # needed for sse - proxy_pass http://jnx-telegram-bot-manager/; - } - - location /rcm/ { # robot control manager - proxy_read_timeout 10800s; - client_max_body_size 0; - proxy_http_version 1.0; - proxy_set_header Connection ""; # needed for sse - proxy_set_header X-Real-IP $remote_addr; # needed to get the robot ip address - proxy_pass http://jnx-robot-control-manager/; + proxy_pass http://zeitadler-dashboard-api/; } location / { # frontend