From b736aea86ade0ef75e91cc74d365494400888276 Mon Sep 17 00:00:00 2001 From: David Montero Crespo Date: Mon, 4 May 2026 00:05:55 -0300 Subject: [PATCH] =?UTF-8?q?refactor:=20rename=20deploy/=20=E2=86=92=20dock?= =?UTF-8?q?er/=20(container=20build,=20not=20host=20deploy)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The folder only holds the in-container nginx + entrypoint that the standalone Dockerfile copies. Calling it "deploy" implied host-level production glue, which now lives in github.com/velxio/velxio-prod. "docker/" makes the build-time vs deploy-time split obvious. Co-Authored-By: Claude Opus 4.7 (1M context) --- Dockerfile.standalone | 4 ++-- {deploy => docker}/entrypoint.sh | 0 {deploy => docker}/nginx.conf | 0 docs/wiki/docker-infrastructure.md | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) rename {deploy => docker}/entrypoint.sh (100%) rename {deploy => docker}/nginx.conf (100%) diff --git a/Dockerfile.standalone b/Dockerfile.standalone index 44ff416f..a00a13a5 100644 --- a/Dockerfile.standalone +++ b/Dockerfile.standalone @@ -129,13 +129,13 @@ COPY backend/scripts/ ./scripts/ # ours as the default_server (was Issue #108: users behind reverse proxies got # the "Welcome to nginx" page because the stock site claimed default_server). RUN rm -f /etc/nginx/sites-enabled/default -COPY deploy/nginx.conf /etc/nginx/conf.d/default.conf +COPY docker/nginx.conf /etc/nginx/conf.d/default.conf # Copy built frontend assets from builder stage COPY --from=frontend-builder /app/frontend/dist /usr/share/nginx/html # Copy and configure entrypoint script (fix Windows CRLF → LF) -COPY deploy/entrypoint.sh /app/entrypoint.sh +COPY docker/entrypoint.sh /app/entrypoint.sh RUN sed -i 's/\r$//' /app/entrypoint.sh && chmod +x /app/entrypoint.sh # ── ESP32 emulation: pre-built QEMU .so + ROM binaries ────────────────────── diff --git a/deploy/entrypoint.sh b/docker/entrypoint.sh similarity index 100% rename from deploy/entrypoint.sh rename to docker/entrypoint.sh diff --git a/deploy/nginx.conf b/docker/nginx.conf similarity index 100% rename from deploy/nginx.conf rename to docker/nginx.conf diff --git a/docs/wiki/docker-infrastructure.md b/docs/wiki/docker-infrastructure.md index 17953d4b..2985dd69 100644 --- a/docs/wiki/docker-infrastructure.md +++ b/docs/wiki/docker-infrastructure.md @@ -485,7 +485,7 @@ The Docker Hub description is automatically updated from the repository's `READM ## Entrypoint Script -**Location:** `deploy/entrypoint.sh` +**Location:** `docker/entrypoint.sh` The entrypoint script runs when the container starts. It initializes development tools and launches the application services. @@ -551,7 +551,7 @@ Using `exec nginx` replaces the shell process with Nginx, making it PID 1. This ## Nginx Reverse Proxy -**Location:** `deploy/nginx.conf` +**Location:** `docker/nginx.conf` ### API Proxy Configuration @@ -994,8 +994,8 @@ For ESP32 first-time compilation (cold build cache), this may still not be enoug | `Dockerfile.standalone` | Multi-stage Docker build (4 stages) | | `.github/workflows/docker-publish.yml` | CI/CD: builds + pushes multi-arch image | | `third-party/qemu-lcgamboa/.github/workflows/build-libqemu.yml` | CI/CD: builds QEMU .so for amd64 + arm64 | -| `deploy/entrypoint.sh` | Container startup script | -| `deploy/nginx.conf` | Nginx reverse proxy configuration | +| `docker/entrypoint.sh` | Container startup script | +| `docker/nginx.conf` | Nginx reverse proxy configuration | | `docker-compose.yml` | Self-hosting compose file (production at github.com/velxio/velxio-prod) | | `prebuilt/qemu/` | Local QEMU prebuilt files (optional, for dev) | | `backend/.env` | Backend environment variables (not committed) |