Skip to content

Commit fabda2e

Browse files
committed
fix: cover docker template data volume
1 parent 2fc75e1 commit fabda2e

3 files changed

Lines changed: 22 additions & 3 deletions

File tree

iii/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ COPY config.yaml /app/config.yaml
1414
# isn't an option.)
1515

1616
# Add 49135 here when enabling iii-worker-manager in config.yaml (Browser SDK / RBAC).
17-
EXPOSE 49134 3111 3112 9464
17+
EXPOSE 49134 3111 3112
1818
ENTRYPOINT ["/app/iii"]
1919
CMD ["--config", "/app/config.yaml"]

iii/docker/docker-compose.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ services:
88
- "49134:49134" # WebSocket (worker connections)
99
- "3111:3111" # REST API
1010
- "3112:3112" # Stream API
11-
- "9464:9464" # Prometheus metrics
1211
# - "49135:49135" # Browser SDK / RBAC — enable iii-worker-manager in config.yaml
1312
volumes:
1413
- ./config.yaml:/app/config.yaml:ro
14+
- iii_data:/app/data
1515
environment:
1616
- RUST_LOG=info
1717
- III_EXECUTION_CONTEXT=docker
@@ -39,6 +39,7 @@ services:
3939
# - rabbitmq_data:/var/lib/rabbitmq
4040
# restart: unless-stopped
4141

42-
# volumes:
42+
volumes:
43+
iii_data:
4344
# redis_data:
4445
# rabbitmq_data:

scripts/smoke-init.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,24 @@ assert_file "$PROJECT_DIR/config.yaml"
5555
assert_file "$PROJECT_DIR/.gitignore"
5656
assert_absent "$PROJECT_DIR/iii.worker.yaml"
5757

58+
echo "Testing iii project init --docker"
59+
(
60+
cd "$TMP_DIR"
61+
iii project init docker-project --docker --skip-iii --template-dir "$TEMPLATE_DIR"
62+
)
63+
64+
DOCKER_PROJECT_DIR="$TMP_DIR/docker-project"
65+
assert_file "$DOCKER_PROJECT_DIR/Dockerfile"
66+
assert_file "$DOCKER_PROJECT_DIR/docker-compose.yml"
67+
assert_file "$DOCKER_PROJECT_DIR/.env"
68+
assert_contains "$DOCKER_PROJECT_DIR/Dockerfile" "EXPOSE 49134 3111 3112"
69+
assert_contains "$DOCKER_PROJECT_DIR/docker-compose.yml" "iii_data:/app/data"
70+
assert_contains "$DOCKER_PROJECT_DIR/docker-compose.yml" "iii_data:"
71+
if grep -Fq "9464" "$DOCKER_PROJECT_DIR/Dockerfile" "$DOCKER_PROJECT_DIR/docker-compose.yml"; then
72+
echo "error: generated Docker assets should not expose stale port 9464" >&2
73+
exit 1
74+
fi
75+
5876
# Worker manifests scaffolded by `iii worker init` declare a `runtime.base_image`
5977
# and `scripts` block (install/start). The legacy `kind:`/`entry:` fields were
6078
# dropped when worker-bare moved to per-language manifests.

0 commit comments

Comments
 (0)