Merge pull request #62 from dbeaver/dbeaver/dbeaver-devops#1956-revert-back-to-nginx-as-default-proxy-main

Dbeaver/dbeaver devops#1956 revert back to nginx as default proxy main

Author: ggxed

.env.example

@@ -5,7 +5,7 @@ COMPOSE_PROJECT_NAME=dbeaver
 CLOUDBEAVER_WEB_SERVER_PORT=8978
 
 # Type of web server. Supported values: nginx, haproxy
-PROXY_TYPE=haproxy
+PROXY_TYPE=nginx
 
 CLOUDBEAVER_DB_DRIVER=postgres-jdbc
 CLOUDBEAVER_DB_URL=jdbc:postgresql://postgres:5432/cloudbeaver

README.md

@@ -32,9 +32,9 @@ Previously, the volumes were owned by the ‘root’ user, but now they are owne
 
 Starting from v25.1, CloudBeaver supports two types of proxy servers: Nginx and HAProxy. You can choose your preferred proxy type by setting the following variable in the .env file:
 
-`PROXY_TYPE=haproxy` # Available options: nginx, haproxy
+`PROXY_TYPE=nginx` # Available options: nginx, haproxy
 
-The default value is `haproxy`. Switching between proxy types is seamless: configuration files and SSL certificates are retained due to shared Docker volumes.  
+The default value is `nginx`. Switching between proxy types is seamless: configuration files and SSL certificates are retained due to shared Docker volumes.  
 However, note that the container name has changed from `nginx` to `web-proxy`.
 
 #### Proxy listen ports

docker-compose-host.yml

@@ -7,19 +7,19 @@ volumes:
   nginx_ssl_data: {}
   nginx_conf_data: {}
   trusted_cacerts: {}
-
+  api_tokens: {}
 services:
   web-proxy:
     restart: unless-stopped
-    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-nginx}:${CLOUDBEAVER_VERSION_TAG}
     network_mode: host
     environment:
       - NETWORK_MODE=host
       - LISTEN_PORT_HTTP=80
       - LISTEN_PORT_HTTPS=443
     volumes:
-      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/
-      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/
+      - nginx_conf_data:/etc/${PROXY_TYPE:-nginx}/product-conf/
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-nginx}/ssl/
     depends_on:
       - cloudbeaver
 
@@ -32,6 +32,7 @@ services:
       - cloudbeaver:/opt/cloudbeaver/workspace
       - cloudbeaver_certs:/opt/cloudbeaver/conf/certificates/
       - trusted_cacerts:/opt/cloudbeaver/workspace/.data/custom/
+      - api_tokens:/opt/cloudbeaver/conf/keys/
     environment:
       - CLOUDBEAVER_DB_DRIVER=${CLOUDBEAVER_DB_DRIVER}
       - CLOUDBEAVER_DB_URL=${CLOUDBEAVER_DB_URL}

docker-compose.yml

@@ -7,14 +7,14 @@ volumes:
   nginx_ssl_data: {}
   nginx_conf_data: {}
   trusted_cacerts: {}
-
+  api_tokens: {}
 networks:
   cloudbeaver-private-net:
 
 services:
   web-proxy:
     restart: unless-stopped
-    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-nginx}:${CLOUDBEAVER_VERSION_TAG}
     ports:
       - 80:8080
       - 443:8443
@@ -23,8 +23,8 @@ services:
     networks:
       - cloudbeaver-private-net
     volumes:
-      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/
-      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/
+      - nginx_conf_data:/etc/${PROXY_TYPE:-nginx}/product-conf/
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-nginx}/ssl/
     depends_on:
       - cloudbeaver
 
@@ -36,6 +36,7 @@ services:
       - cloudbeaver:/opt/cloudbeaver/workspace
       - cloudbeaver_certs:/opt/cloudbeaver/conf/certificates/
       - trusted_cacerts:/opt/cloudbeaver/workspace/.data/custom/
+      - api_tokens:/opt/cloudbeaver/conf/keys/
     environment:
       - CLOUDBEAVER_DB_DRIVER=${CLOUDBEAVER_DB_DRIVER}
       - CLOUDBEAVER_DB_URL=${CLOUDBEAVER_DB_URL}

podman-compose.yml

@@ -11,12 +11,13 @@ volumes:
   nginx_ssl_data: {}
   nginx_conf_data: {}
   trusted_cacerts:  {}
+  api_tokens: {}
 networks:
   cloudbeaver-private-net: null
 services:
   web-proxy:
     restart: unless-stopped
-    image: ${PODMAN_IMAGE_SOURCE:-docker.io/dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
+    image: ${PODMAN_IMAGE_SOURCE:-docker.io/dbeaver}/cloudbeaver-${PROXY_TYPE:-nginx}:${CLOUDBEAVER_VERSION_TAG}
     ports:
       - 80:8080
       - 443:8443
@@ -25,8 +26,8 @@ services:
     networks:
       - cloudbeaver-private-net
     volumes:
-      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/:z
-      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/:z
+      - nginx_conf_data:/etc/${PROXY_TYPE:-nginx}/product-conf/:z
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-nginx}/ssl/:z
     depends_on:
       - cloudbeaver
   cloudbeaver:
@@ -39,6 +40,7 @@ services:
       - cloudbeaver:/opt/cloudbeaver/workspace:z
       - cloudbeaver_certs:/opt/cloudbeaver/conf/certificates/:z
       - trusted_cacerts:/opt/cloudbeaver/workspace/.data/custom/:z
+      - api_tokens:/opt/cloudbeaver/conf/keys/:z
     environment:
       - CLOUDBEAVER_DB_DRIVER=${CLOUDBEAVER_DB_DRIVER}
       - CLOUDBEAVER_DB_URL=${CLOUDBEAVER_DB_URL}