Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 6 commits into
base: devel
Choose a base branch
from
+16 −16
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f3e0940
dbeaver/dbeaver-devops#1670 Changed nginx to haproxy configuration
ggxed Jan 17, 2025
a80a756
dbeaver/dbeaver-devops#1670 Changed nginx to haproxy configuration
ggxed Jan 17, 2025
8081c06
dbeaver/dbeaver-devops#1670 Changed image name to cloudbeaver-proxy
ggxed Jan 21, 2025
64a667e
dbeaver/dbeaver-devops#1670 Changed name proxy service to web-proxy a…
ggxed Jan 22, 2025
6dd753f
dbeaver/dbeaver-devops#1679 Reverted ngixn volumes names
ggxed Jan 23, 2025
ed4975d
dbeaver/dbeaver-devops#1670 Fixed DMSC url
ggxed Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions docker-compose-host.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ volumes:
nginx_conf_data: {}

services:
nginx:
web-proxy:
restart: unless-stopped
image: $IMAGE_SOURCE/cloudbeaver-nginx:${CLOUDBEAVER_VERSION_TAG}
image: $IMAGE_SOURCE/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/haproxy/conf/
- nginx_ssl_data:/etc/haproxy/ssl/
depends_on:
- cloudbeaver

Expand Down
9 changes: 5 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ networks:
cloudbeaver-private-net:

services:
nginx:
web-proxy:
restart: unless-stopped
image: $IMAGE_SOURCE/cloudbeaver-nginx:${CLOUDBEAVER_VERSION_TAG}
image: $IMAGE_SOURCE/haproxy:${CLOUDBEAVER_VERSION_TAG}
ports:
- 80:8080
- 443:8443
Expand All @@ -22,8 +22,8 @@ services:
networks:
- cloudbeaver-private-net
volumes:
- nginx_conf_data:/etc/nginx/product-conf/
- nginx_ssl_data:/etc/nginx/ssl/
- nginx_conf_data:/etc/haproxy/conf/
- nginx_ssl_data:/etc/haproxy/ssl/
depends_on:
- cloudbeaver

Expand All @@ -47,6 +47,7 @@ services:
- CLOUDBEAVER_QM_DB_USER=${CLOUDBEAVER_QM_DB_USER}
- CLOUDBEAVER_QM_DB_PASSWORD=${CLOUDBEAVER_QM_DB_PASSWORD}
- CLOUDBEAVER_QM_DB_SCHEMA=${CLOUDBEAVER_QM_DB_SCHEMA}
- CLOUDBEAVER_DMSVC_URL=http://web-proxy:11000
expose:
- ${CLOUDBEAVER_WEB_SERVER_PORT:-8978}
depends_on:
Expand Down
11 changes: 5 additions & 6 deletions podman-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,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}/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/haproxy/conf/:z
- nginx_ssl_data:/etc/haproxy/ssl/:z
depends_on:
- cloudbeaver
cloudbeaver:
Expand All @@ -50,6 +48,7 @@ services:
- CLOUDBEAVER_QM_DB_USER=${CLOUDBEAVER_QM_DB_USER}
- CLOUDBEAVER_QM_DB_PASSWORD=${CLOUDBEAVER_QM_DB_PASSWORD}
- CLOUDBEAVER_QM_DB_SCHEMA=${CLOUDBEAVER_QM_DB_SCHEMA}
- CLOUDBEAVER_DMSVC_URL=http://web-proxy:11000
expose:
- ${CLOUDBEAVER_WEB_SERVER_PORT:-8978}
depends_on:
Expand Down