dbeaver/pro#5931 merge devel into main (#58)

* dbeaver/dbeaver-devops#1714 Updated devel ea version

* dbeaver/dbeaver-devops#1714 Fixed env

* dbeaver/dbeaver-devops#1838 Fixed ingress type and ingressClassName (#48)

* dbeaver/dbeaver-devops#1838 Fixed ingress type and ingressClassName

* dbeaver/dbeaver-devops#1670 Changed nginx to haproxy configuration (#39)


* dbeaver/dbeaver-devops#1670 Changed nginx to haproxy configuration

* dbeaver/dbeaver-devops#1670 Changed image name to cloudbeaver-proxy

* dbeaver/dbeaver-devops#1670 Changed name proxy service to web-proxy and image name to haproxy

* dbeaver/dbeaver-devops#1679 Reverted ngixn volumes names

* dbeaver/dbeaver-devops#1670 Fixed DMSC url

* dbeaver/dbeaver-devops#1670 Changed haproxy conf volume

* dbeaver/dbeaver-devops#1670 Changed haproxy conf volume

* dbeaver/dbeaver-devops#1670 Revert volume nginx_conf_data

* dbeaver/dbeaver-devops#1670 Added template for changin proxy type via env param

* dbeaver/dbeaver-devops#1670 Added template for changin proxy type via env param

* dbeaver/dbeaver-devops#1670 Adde default value PROXY_TYPE -haproxy

* dbeaver/dbeaver-devops#1670 Fixed default value for IMAGE_SOURCE and fix volume PROXY_TYPE value

* dbeaver/dbeaver-devops#1670 Remove CLOUDBEAVER_DMSVC_URL and made CLOUDBEAVER_DMSVC_URL=http://web-proxy:11000 hardcoded in product code

* dbeaver/dbeaver-devops#1848 edit docs: remove node balancing

* dbeaver/dbeaver-devops#1847 Describe Haproxy feature in cloudbeaver-d… (#50)

* dbeaver/dbeaver-devops#1847 Describe Haproxy feature in cloudbeaver-deploy

* dbeaver/dbeaver-devops#1847 Formated

* Dbeaver/dbeaver devops#1884 make all deployments configs example prefix (#52)

* dbeaver/dbeaver-devops#1884 Made variables.tf and .env with prefix example and add .evn variables.tf in gitignore

* dbeaver/dbeaver-devops#1884 Adde .env.example

* dbeaver/dbeaver-devops#1884 Moved example from prefix to suffix in varible.tf

* dbeaver/dbeaver-devops#1884 Moved example from prefix to suffix in varible.tf

* dbeaver/dbeaver-devops#1884 Removed REPLICA_COUNT_EE from deployment

* dbeaver/dbeaver-devops#1884 Changed http:// —> https:// in access the app

* dbeaver/pro#5931 update devel to 25 1 0 (#54)

* dbeaver/pro#5931 Updated devel version to 25.1.0

* dbeaver/pro#5931 Removed old .env file (#56)

---------

Co-authored-by: Anya Ovsyannikova <arhayka@gmail.com>

Author: ggxed

.env .env.example.env renamed to .env.example

@@ -1,9 +1,11 @@
-CLOUDBEAVER_VERSION_TAG=25.0.0
+CLOUDBEAVER_VERSION_TAG=25.1.0
 IMAGE_SOURCE=dbeaver
 PODMAN_IMAGE_SOURCE=docker.io/dbeaver
 COMPOSE_PROJECT_NAME=dbeaver
 CLOUDBEAVER_WEB_SERVER_PORT=8978
-REPLICA_COUNT_EE=1
+
+# Type of web server. Supported values: nginx, haproxy
+PROXY_TYPE=haproxy
 
 CLOUDBEAVER_DB_DRIVER=postgres-jdbc
 CLOUDBEAVER_DB_URL=jdbc:postgresql://postgres:5432/cloudbeaver

.gitignore

@@ -2,4 +2,6 @@
 terraform*
 values.yaml
 /.idea
-trusted-cacerts/*
+trusted-cacerts/*
+.env
+variables.tf

AWS/ecs-fargate/README.md

@@ -19,6 +19,7 @@
 
  **Note:** only [Amazon RDS for PostgreSQL](https://aws.amazon.com/rds/postgresql/) is supported. RDS database will be set up as an internal database for this deployment.  
       - Navigate to `cloudbeaver-deploy/AWS/ecs-fargate`  
+      - Copy `variables.tf.example` to `variables.tf`
       - Open `variables.tf` file.  
       - Specify `rds_db_version`, the default is `postgres:16.1`. Only PostgreSQL version can be specified.  
       - Set the credentials for database in `cloudbeaver-db-env`. By default it is `postgres`.  

AWS/ecs-fargate/variables.tf AWS/ecs-fargate/variables.tf.exampleAWS/ecs-fargate/variables.tf renamed to AWS/ecs-fargate/variables.tf.example

@@ -25,7 +25,7 @@ variable "cloudbeaver_image_name" {
 variable "cloudbeaver_version" {
   description = "The version of the cluster you want to deploy"
   type = string
-  default = "25.0.0"
+  default = "25.1.0"
 }
 
 variable "alb_certificate_Identifier" {

README.md

@@ -1,6 +1,6 @@
 # CloudBeaver Enterprise deployment
 
-### Version 25.0
+### Version 25.1
 
 CloudBeaver Enterprise is a client-server application.
 It requires server deployment. You can deploy it on a single host (e.g. your local computer) or in a cloud.
@@ -11,9 +11,7 @@ It is the simplest way to install [CloudBeaver Enterprise Edition](https://dbeav
 All you need is a Linux, macOS, or Windows machine with Docker.
 
 CloudBeaver can be run in a [single docker container](https://dbeaver.com/docs/cloudbeaver/CloudBeaver-Enterprise-deployment-from-docker-image/).  
-However you can use Docker compose for additional product features such as:
-- Load balancing
-- Easy web server (HTTPS) configuration
+However you can use Docker compose for easy web server (HTTPS) configuration.
 
 ### System requirements
 - Minimum 4GB RAM
@@ -30,20 +28,49 @@ If a user with ‘UID=8978’ already exists in your environment, permission con
 Additionally, the default Docker volumes directory’s ownership has changed.  
 Previously, the volumes were owned by the ‘root’ user, but now they are owned by the ‘dbeaver’ user (‘UID=8978’).  
 
+### Configuring proxy server (Nginx / HAProxy)
+
+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
+
+The default value is `haproxy`. 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
+
+When using Docker Compose with host networking mode (network_mode: host), you may configure proxy ports using these environment variables:
+```
+LISTEN_PORT_HTTP=80
+LISTEN_PORT_HTTPS=443
+```
+These variables specify which ports the proxy listens to inside the container.
+
+#### Notes for Nginx users
+
+If you use Nginx as your proxy server and customize the `COMPOSE_PROJECT_NAME` in your .env file, make sure to pass this variable explicitly to the container environment:
+```
+environment:
+  - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
+```
+This step is only required for Nginx, as HAProxy resolves service names via Docker DNS automatically.
+
 ### Configuring and starting the CloudBeaver cluster
 1. Clone repository
    ```sh
    git clone https://github.com/dbeaver/cloudbeaver-deploy
    ```
-1. Open the configuration file
+2. Open the configuration file
+    - Navigate to `cloudbeaver-deploy`
+    - Copy `.env.example` to `.env`
     - Edit the `.env` file to set configuration properties
     - It is highly recommended to change the default database password in `CLOUDBEAVER_DB_PASSWORD` variable
-1. Start the cluster
+3. Start the cluster
     - `docker-compose up -d` or `docker compose up -d`
-1. Ensure the following TCP ports are available in your network stack
+4. Ensure the following TCP ports are available in your network stack
     - 80/tcp
     - 443/tcp (for HTTPS access)
-1. Open `http://<deployment-machine-ip-address>` to access the app. This URL will open the admin panel when the app is first started.
+5. Open `https://<deployment-machine-ip-address>` to access the app. This URL will open the admin panel when the app is first started.
 
 ### Stopping the cluster
 `docker-compose down`
@@ -75,6 +102,7 @@ or replace `docker-compose.yml` with `podman-compose.yml` and use `podman-compos
 3. Restart the cluster: `docker-compose up -d` or `docker compose up -d`
 
 ### Older versions:
+- [25.0.0](https://github.com/dbeaver/cloudbeaver-deploy/tree/25.0.0)
 - [24.3.0](https://github.com/dbeaver/cloudbeaver-deploy/tree/24.3.0)
 - [24.2.0](https://github.com/dbeaver/cloudbeaver-deploy/tree/24.2.0)
 - [24.1.0](https://github.com/dbeaver/cloudbeaver-deploy/tree/24.1.0)

docker-compose-host.yml

@@ -9,22 +9,22 @@ volumes:
   trusted_cacerts: {}
 
 services:
-  nginx:
+  web-proxy:
     restart: unless-stopped
-    image: $IMAGE_SOURCE/cloudbeaver-nginx:${CLOUDBEAVER_VERSION_TAG}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
     network_mode: host
     environment:
       - NETWORK_MODE=host
-      - NGINX_LISTEN_PORT_HTTP=80
-      - NGINX_LISTEN_PORT_HTTPS=443
+      - LISTEN_PORT_HTTP=80
+      - LISTEN_PORT_HTTPS=443
     volumes:
-      - nginx_conf_data:/etc/nginx/product-conf/
-      - nginx_ssl_data:/etc/nginx/ssl/
+      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/
     depends_on:
       - cloudbeaver
 
   cloudbeaver:
-    image: $IMAGE_SOURCE/cloudbeaver-ee:${CLOUDBEAVER_VERSION_TAG}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-ee:${CLOUDBEAVER_VERSION_TAG}
     hostname: cloudbeaver
     network_mode: host
     restart: unless-stopped

docker-compose.yml

@@ -12,9 +12,9 @@ networks:
   cloudbeaver-private-net:
 
 services:
-  nginx:
+  web-proxy:
     restart: unless-stopped
-    image: $IMAGE_SOURCE/cloudbeaver-nginx:${CLOUDBEAVER_VERSION_TAG}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
     ports:
       - 80:8080
       - 443:8443
@@ -23,17 +23,15 @@ services:
     networks:
       - cloudbeaver-private-net
     volumes:
-      - nginx_conf_data:/etc/nginx/product-conf/
-      - nginx_ssl_data:/etc/nginx/ssl/
+      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/
     depends_on:
       - cloudbeaver
 
   cloudbeaver:
     restart: unless-stopped
     hostname: cloudbeaver
-    image: $IMAGE_SOURCE/cloudbeaver-ee:${CLOUDBEAVER_VERSION_TAG}
-    deploy:
-      replicas: ${REPLICA_COUNT_EE:-1}
+    image: ${IMAGE_SOURCE:-dbeaver}/cloudbeaver-ee:${CLOUDBEAVER_VERSION_TAG}
     volumes:
       - cloudbeaver:/opt/cloudbeaver/workspace
       - cloudbeaver_certs:/opt/cloudbeaver/conf/certificates/

k8s/Chart.yaml

@@ -3,4 +3,4 @@ name: cb
 description: A Helm chart for CloudBeaver application
 type: application
 version: 0.0.1
-appVersion: 25.0.0
+appVersion: 25.1.0

k8s/values.example.yaml k8s/values.yaml.examplek8s/values.example.yaml renamed to k8s/values.yaml.example

@@ -6,7 +6,7 @@
 cloudbeaver:
   replicaCount: 1
   image: dbeaver/cloudbeaver-ee
-  imageTag: "25.0.0"
+  imageTag: "25.1.0"
   pullPolicy: Always
   # pullCredsName - name of a secret config map that contains docker repo auths
   # pullCredsName: regcred

podman-compose.yml

@@ -14,21 +14,19 @@ volumes:
 networks:
   cloudbeaver-private-net: null
 services:
-  nginx:
+  web-proxy:
     restart: unless-stopped
-    image: ${PODMAN_IMAGE_SOURCE:-docker.io/dbeaver}/cloudbeaver-nginx:${CLOUDBEAVER_VERSION_TAG}
+    image: ${PODMAN_IMAGE_SOURCE:-docker.io/dbeaver}/cloudbeaver-${PROXY_TYPE:-haproxy}:${CLOUDBEAVER_VERSION_TAG}
     ports:
       - 80:8080
       - 443:8443
     environment:
-      - REPLICA_COUNT_EE=${REPLICA_COUNT_EE:-1}
-      - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-dbeaver}
       - CLOUDBEAVER_WEB_SERVER_PORT=${CLOUDBEAVER_WEB_SERVER_PORT:-8978}
     networks:
       - cloudbeaver-private-net
     volumes:
-      - nginx_conf_data:/etc/nginx/product-conf/:z
-      - nginx_ssl_data:/etc/nginx/ssl/:z
+      - nginx_conf_data:/etc/${PROXY_TYPE:-haproxy}/product-conf/:z
+      - nginx_ssl_data:/etc/${PROXY_TYPE:-haproxy}/ssl/:z
     depends_on:
       - cloudbeaver
   cloudbeaver: