Skip to content

Commit fb8b9e0

Browse files
committed
remove DD, add Nginx service and add SSL configuration for GLM and DeepSeek services
1 parent 738ba34 commit fb8b9e0

File tree

2 files changed

+74
-50
lines changed

2 files changed

+74
-50
lines changed

DeepSeek-V3.1.yaml

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,26 @@ x-vllm-proxy-common: &vllm-proxy-common
4343
logging: *logging-conf
4444

4545
services:
46-
datadog-agent:
47-
image: datadog/agent@sha256:0920550d798e459025620e6c3f9b0e857db94b9f29762a4e194a4a3967037498
48-
container_name: datadog-agent
49-
environment:
50-
- DD_API_KEY=${DD_API_KEY}
51-
- DD_SITE=us3.datadoghq.com
52-
- DD_ENV=prod
53-
- DD_LOGS_ENABLED=true
54-
- DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true
55-
- DD_CONTAINER_EXCLUDE_LOGS="name:datadog-agent"
56-
- DD_PROCESS_AGENT_ENABLED=true
57-
- DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true
58-
- DD_HOSTNAME=$DD_HOSTNAME
59-
- DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT=0.0.0.0:4317
46+
nginx:
47+
image: nginx:alpine
48+
container_name: nginx
49+
ports:
50+
- "80:80"
51+
- "443:443"
6052
volumes:
61-
- /var/run/docker.sock:/var/run/docker.sock:ro
62-
- /proc/:/host/proc/:ro
63-
- /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
64-
- /var/lib/docker/containers:/var/lib/docker/containers:ro
65-
- /run/log/journal:/run/log/journal:ro
66-
- /run/systemd/:/host/run/systemd/:ro
53+
- /etc/letsencrypt:/etc/letsencrypt:ro
6754
configs:
68-
- source: journald_config_file
69-
target: /etc/datadog-agent/conf.d/journald.d/conf.yaml
70-
mode: 0755
55+
- source: nginx_conf
56+
target: /etc/nginx/conf.d/default.conf
57+
mode: 0644
58+
depends_on:
59+
- vllm-proxy-deepseek
7160
restart: unless-stopped
7261
logging: *logging-conf
7362

7463
vllm-proxy-deepseek:
7564
<<: *vllm-proxy-common
7665
container_name: vllm-proxy-deepseek
77-
ports:
78-
- "8000:8000"
7966
environment:
8067
- MODEL_NAME=deepseek-ai/DeepSeek-V3.1
8168
- TOKEN=${PROXY_TOKEN}
@@ -141,6 +128,31 @@ volumes:
141128
vllm_cache:
142129

143130
configs:
131+
nginx_conf:
132+
content: |
133+
server {
134+
listen 80;
135+
listen 443 ssl;
136+
137+
ssl_certificate /etc/letsencrypt/live/completions.near.ai/fullchain.pem;
138+
ssl_certificate_key /etc/letsencrypt/live/completions.near.ai/privkey.pem;
139+
ssl_protocols TLSv1.2 TLSv1.3;
140+
141+
client_max_body_size 100m;
142+
143+
location / {
144+
proxy_pass http://vllm-proxy-deepseek:8000;
145+
proxy_http_version 1.1;
146+
proxy_set_header Host $host;
147+
proxy_set_header X-Real-IP $remote_addr;
148+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
149+
proxy_set_header X-Forwarded-Proto $scheme;
150+
proxy_set_header Connection '';
151+
proxy_buffering off;
152+
proxy_cache off;
153+
proxy_read_timeout 300s;
154+
}
155+
}
144156
chat_template_deepseek:
145157
content: |
146158
{% if not add_generation_prompt is defined %}

GLM-4.7.yaml

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,26 @@ x-vllm-proxy-common: &vllm-proxy-common
4343
logging: *logging-conf
4444

4545
services:
46-
datadog-agent:
47-
image: datadog/agent@sha256:0920550d798e459025620e6c3f9b0e857db94b9f29762a4e194a4a3967037498
48-
container_name: datadog-agent
49-
environment:
50-
- DD_API_KEY=${DD_API_KEY}
51-
- DD_SITE=us3.datadoghq.com
52-
- DD_ENV=prod
53-
- DD_LOGS_ENABLED=true
54-
- DD_LOGS_CONFIG_CONTAINER_COLLECT_ALL=true
55-
- DD_CONTAINER_EXCLUDE_LOGS="name:datadog-agent"
56-
- DD_PROCESS_AGENT_ENABLED=true
57-
- DD_DOGSTATSD_NON_LOCAL_TRAFFIC=true
58-
- DD_HOSTNAME=$DD_HOSTNAME
59-
- DD_OTLP_CONFIG_RECEIVER_PROTOCOLS_GRPC_ENDPOINT=0.0.0.0:4317
46+
nginx:
47+
image: nginx:alpine
48+
container_name: nginx
49+
ports:
50+
- "80:80"
51+
- "443:443"
6052
volumes:
61-
- /var/run/docker.sock:/var/run/docker.sock:ro
62-
- /proc/:/host/proc/:ro
63-
- /sys/fs/cgroup/:/host/sys/fs/cgroup:ro
64-
- /var/lib/docker/containers:/var/lib/docker/containers:ro
65-
- /run/log/journal:/run/log/journal:ro
66-
- /run/systemd/:/host/run/systemd/:ro
53+
- /etc/letsencrypt:/etc/letsencrypt:ro
6754
configs:
68-
- source: journald_config_file
69-
target: /etc/datadog-agent/conf.d/journald.d/conf.yaml
70-
mode: 0755
55+
- source: nginx_conf
56+
target: /etc/nginx/conf.d/default.conf
57+
mode: 0644
58+
depends_on:
59+
- vllm-proxy-glm
7160
restart: unless-stopped
7261
logging: *logging-conf
7362

7463
vllm-proxy-glm:
7564
<<: *vllm-proxy-common
7665
container_name: vllm-proxy-glm
77-
ports:
78-
- "8000:8000"
7966
environment:
8067
- MODEL_NAME=zai-org/GLM-4.7
8168
- TOKEN=${PROXY_TOKEN}
@@ -133,6 +120,31 @@ volumes:
133120
vllm_cache:
134121

135122
configs:
123+
nginx_conf:
124+
content: |
125+
server {
126+
listen 80;
127+
listen 443 ssl;
128+
129+
ssl_certificate /etc/letsencrypt/live/completions.near.ai/fullchain.pem;
130+
ssl_certificate_key /etc/letsencrypt/live/completions.near.ai/privkey.pem;
131+
ssl_protocols TLSv1.2 TLSv1.3;
132+
133+
client_max_body_size 100m;
134+
135+
location / {
136+
proxy_pass http://vllm-proxy-glm:8000;
137+
proxy_http_version 1.1;
138+
proxy_set_header Host $host;
139+
proxy_set_header X-Real-IP $remote_addr;
140+
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
141+
proxy_set_header X-Forwarded-Proto $scheme;
142+
proxy_set_header Connection '';
143+
proxy_buffering off;
144+
proxy_cache off;
145+
proxy_read_timeout 300s;
146+
}
147+
}
136148
journald_config_file:
137149
content: |
138150
logs:

0 commit comments

Comments
 (0)