feature/ci-cd #67

Merged
admin merged 15 commits from feature/ci-cd into master 2026-08-24 11:09:40 +03:30
7 changed files with 24 additions and 17 deletions
Showing only changes of commit eff27e359b - Show all commits

2
.gitattributes vendored Normal file
View File

@@ -0,0 +1,2 @@
# Shell scripts must use LF — CRLF breaks Alpine entrypoints ("No such file or directory").
*.sh text eol=lf

View File

@@ -47,7 +47,8 @@ COPY --from=builder /app/dist ./dist
COPY --from=builder /app/node_modules ./node_modules COPY --from=builder /app/node_modules ./node_modules
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh # Windows git/build context may use CRLF; strip before chmod (fixes dumb-init "No such file or directory").
RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh && chmod +x /usr/local/bin/docker-entrypoint.sh
RUN mkdir -p /app/logs && \ RUN mkdir -p /app/logs && \
chown -R dyolink:nodejs /app chown -R dyolink:nodejs /app

View File

@@ -45,7 +45,8 @@ COPY --from=builder --chown=dyolink:nodejs /app/.next/standalone ./
COPY --from=builder --chown=dyolink:nodejs /app/.next/static ./.next/static COPY --from=builder --chown=dyolink:nodejs /app/.next/static ./.next/static
COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh # Windows git/build context may use CRLF; strip before chmod (fixes dumb-init "No such file or directory").
RUN sed -i 's/\r$//' /usr/local/bin/docker-entrypoint.sh && chmod +x /usr/local/bin/docker-entrypoint.sh
USER dyolink USER dyolink

View File

@@ -249,6 +249,8 @@ On the Windows host, from repo `infrastructure/`:
| Port 8088 unreachable | Windows firewall rule; confirm nginx container is up | | Port 8088 unreachable | Windows firewall rule; confirm nginx container is up |
| Backend restart loop | JWT secrets still placeholder; fix `backend.staging.env` | | Backend restart loop | JWT secrets still placeholder; fix `backend.staging.env` |
| Backend DB auth error | `DATABASE_URL` password ≠ `POSTGRES_PASSWORD` | | Backend DB auth error | `DATABASE_URL` password ≠ `POSTGRES_PASSWORD` |
| `dumb-init docker-entrypoint.sh: No such file or directory` | Windows CRLF in shell scripts — fixed in Dockerfiles (rebuild images). |
| `nginx: host not found in upstream "backend:3000"` | Backend/frontend not running yet — fix entrypoint/env first; nginx config uses Docker DNS resolver. |
**Logs:** **Logs:**

View File

@@ -85,8 +85,10 @@ services:
image: nginx:alpine image: nginx:alpine
container_name: dyolink_nginx_staging container_name: dyolink_nginx_staging
depends_on: depends_on:
- backend backend:
- frontend condition: service_healthy
frontend:
condition: service_healthy
ports: ports:
- "${STAGING_HTTP_PORT:-8088}:80" - "${STAGING_HTTP_PORT:-8088}:80"
volumes: volumes:

View File

@@ -87,8 +87,10 @@ services:
image: nginx:alpine image: nginx:alpine
container_name: dyolink_nginx_staging container_name: dyolink_nginx_staging
depends_on: depends_on:
- backend backend:
- frontend condition: service_healthy
frontend:
condition: service_healthy
ports: ports:
- "${STAGING_HTTP_PORT:-8088}:80" - "${STAGING_HTTP_PORT:-8088}:80"
volumes: volumes:

View File

@@ -1,15 +1,10 @@
# HTTP only — local dev and IP-based staging (no TLS). # HTTP only — local dev and IP-based staging (no TLS).
# Use with: docker compose and map host port e.g. 8080:80 or 8088:80 # Use with: docker compose and map host port e.g. 8080:80 or 8088:80
#
# Dynamic proxy_pass via Docker DNS (127.0.0.11) so nginx starts even if
# backend/frontend containers are not up yet (static upstream blocks fail at boot).
upstream dyolink_backend { resolver 127.0.0.11 valid=10s ipv6=off;
server backend:3000;
keepalive 32;
}
upstream dyolink_frontend {
server frontend:3000;
keepalive 32;
}
server { server {
listen 80; listen 80;
@@ -19,7 +14,8 @@ server {
client_max_body_size 50M; client_max_body_size 50M;
location / { location / {
proxy_pass http://dyolink_frontend; set $frontend_upstream http://frontend:3000;
proxy_pass $frontend_upstream;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';
@@ -33,7 +29,8 @@ server {
} }
location /api { location /api {
proxy_pass http://dyolink_backend; set $backend_upstream http://backend:3000;
proxy_pass $backend_upstream;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection 'upgrade'; proxy_set_header Connection 'upgrade';