Peng Ding commited on
Commit
d40d11d
Β·
1 Parent(s): 5ef766b

feat: separate dev/prod deployment stacks

Browse files

- deploy-dev now targets veilrender-dev stack (port 7861)
- Prod stays on veilrender stack (port 7860)
- Add deploy/compose-dev.yaml for dev instances
- NPS host veilrender-dev.service.oaklight.top added

Files changed (2) hide show
  1. Makefile +3 -3
  2. deploy/compose-dev.yaml +20 -0
Makefile CHANGED
@@ -52,7 +52,7 @@ push-package:
52
  # ──────────────────────────────────────────────
53
 
54
  SSH_TARGET ?=
55
- DEVTEST_STACK ?= /dockervol/dockge/stacks/veilrender
56
 
57
  # Build dev-test image, push to remote VPS, restart container.
58
  # Usage: make deploy-dev SSH_TARGET=cloud.usa2
@@ -75,7 +75,7 @@ endif
75
  if [ -n "$(POOL)" ]; then \
76
  COMPOSE_SRC="deploy/compose-pool.yaml"; \
77
  else \
78
- COMPOSE_SRC="deploy/compose.yaml"; \
79
  fi; \
80
  docker save $(DOCKER_IMAGE):dev-test | zstd -3 | ssh $(SSH_TARGET) \
81
  'zstd -d | docker load'; \
@@ -87,7 +87,7 @@ endif
87
  docker compose up -d --force-recreate && \
88
  sleep 5 && \
89
  echo "=== Health check ===" && \
90
- curl -sS -o /dev/null -w "%{http_code} /health\n" http://127.0.0.1:7860/ || true'; \
91
  echo "==> VPS dev-test deployed successfully ($$DEV_VER, $${COMPOSE_SRC})."
92
 
93
  # Deploy to Hugging Face Spaces by pushing current code.
 
52
  # ──────────────────────────────────────────────
53
 
54
  SSH_TARGET ?=
55
+ DEVTEST_STACK ?= /dockervol/dockge/stacks/veilrender-dev
56
 
57
  # Build dev-test image, push to remote VPS, restart container.
58
  # Usage: make deploy-dev SSH_TARGET=cloud.usa2
 
75
  if [ -n "$(POOL)" ]; then \
76
  COMPOSE_SRC="deploy/compose-pool.yaml"; \
77
  else \
78
+ COMPOSE_SRC="deploy/compose-dev.yaml"; \
79
  fi; \
80
  docker save $(DOCKER_IMAGE):dev-test | zstd -3 | ssh $(SSH_TARGET) \
81
  'zstd -d | docker load'; \
 
87
  docker compose up -d --force-recreate && \
88
  sleep 5 && \
89
  echo "=== Health check ===" && \
90
+ curl -sS -o /dev/null -w "%{http_code} /health\n" http://127.0.0.1:7861/ || true'; \
91
  echo "==> VPS dev-test deployed successfully ($$DEV_VER, $${COMPOSE_SRC})."
92
 
93
  # Deploy to Hugging Face Spaces by pushing current code.
deploy/compose-dev.yaml ADDED
@@ -0,0 +1,20 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ # Dev instance: VeilRender with embedded CloakBrowser on port 7861
2
+ services:
3
+ veilrender-dev:
4
+ image: oaklight/veilrender:dev-test
5
+ container_name: veilrender-dev
6
+ restart: unless-stopped
7
+ ports:
8
+ - "7861:7860"
9
+ environment:
10
+ - VEILRENDER_API_TOKEN=${VEILRENDER_API_TOKEN:-changeme}
11
+ - VEILRENDER_RESOURCE_FILTER=true
12
+ volumes:
13
+ - veilrender-dev-data:/data
14
+ deploy:
15
+ resources:
16
+ limits:
17
+ memory: 2G
18
+
19
+ volumes:
20
+ veilrender-dev-data: