From 493156f9149339cd8a38b7cee67f586af44b8b1e Mon Sep 17 00:00:00 2001 From: afeiszli Date: Fri, 5 Nov 2021 11:40:10 -0400 Subject: [PATCH] reverting docker-compose --- compose/docker-compose.caddy.yml | 15 +++++++-------- docker/Caddyfile | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/compose/docker-compose.caddy.yml b/compose/docker-compose.caddy.yml index f78b233c..082a8603 100644 --- a/compose/docker-compose.caddy.yml +++ b/compose/docker-compose.caddy.yml @@ -35,6 +35,10 @@ services: CORS_ALLOWED_ORIGIN: "*" DATABASE: "sqlite" NODE_ID: "netmaker-server-1" + ports: + - "51821-51830:51821-51830/udp" + - "8081:8081" + - "50051:50051" netmaker-ui: container_name: netmaker-ui depends_on: @@ -42,6 +46,8 @@ services: image: gravitl/netmaker-ui:v0.8.5 links: - "netmaker:api" + ports: + - "8082:80" environment: BACKEND_URL: "https://api.NETMAKER_BASE_DOMAIN" restart: always @@ -61,14 +67,7 @@ services: image: caddy:latest container_name: caddy restart: unless-stopped - links: - - netmaker:api - - netmaker-ui:ui - ports: - - 80:80 - - 443:443 - cap_add: - - cap_net_bind_service + network_mode: host # Wants ports 80 and 443! volumes: - /root/Caddyfile:/etc/caddy/Caddyfile # - $PWD/site:/srv # you could also serve a static site in site folder diff --git a/docker/Caddyfile b/docker/Caddyfile index e8745ed3..646a0e98 100644 --- a/docker/Caddyfile +++ b/docker/Caddyfile @@ -5,15 +5,15 @@ # Dashboard https://dashboard.NETMAKER_BASE_DOMAIN { - reverse_proxy http://ui:80 + reverse_proxy http://127.0.0.1:8082 } # API https://api.NETMAKER_BASE_DOMAIN { - reverse_proxy http://api:8081 + reverse_proxy http://127.0.0.1:8081 } # gRPC https://grpc.NETMAKER_BASE_DOMAIN { - reverse_proxy h2c://api:50051 -} + reverse_proxy h2c://127.0.0.1:50051 +} \ No newline at end of file