🐳 Update to modern Docker Compose v2 and fix GitHub Actions CI/CD

- Update docker-compose.yml to use modern 'docker compose' syntax (v2)
- Fix GitHub Actions Docker login to use GitHub Container Registry (ghcr.io)
- Add comprehensive GitHub repository settings documentation
- Add alternative CI/CD workflow without Docker push requirement
- Update package.json scripts for modern Docker commands
- Add Docker security scanning and metadata extraction
- Add repository permissions configuration for GitHub Actions
- Update Docker documentation with modern practices

This addresses the Docker login issues and modernizes the deployment
process while providing fallback options for CI/CD implementation.
This commit is contained in:
Alvin-Zilverstand
2026-01-19 10:15:52 +01:00
parent d2b3892992
commit e0c89bbb87
6 changed files with 425 additions and 24 deletions

View File

@@ -6,18 +6,19 @@ This directory contains Docker configuration files for deploying the SnowWorld N
### Prerequisites
- Docker Engine 20.10+
- Docker Compose 1.29+
- Docker Compose v2.0+
### Build and Run
```bash
# Build the Docker image
docker build -t snowworld-narrowcasting .
# Navigate to docker directory
cd deployment/docker
# Run with Docker Compose
docker-compose up -d
# Build and run with Docker Compose v2
docker compose up -d
# Or run manually
# Or build manually from root directory
docker build -f deployment/docker/Dockerfile -t snowworld-narrowcasting .
docker run -d -p 3000:3000 --name snowworld snowworld-narrowcasting
```
@@ -26,6 +27,21 @@ docker run -d -p 3000:3000 --name snowworld snowworld-narrowcasting
- Admin dashboard: http://localhost:3000/admin
- Client display: http://localhost:3000/client?zone=reception
### Docker Compose v2 Commands
```bash
# Start services
docker compose up -d
# Stop services
docker compose down
# View logs
docker compose logs -f
# Rebuild services
docker compose build --no-cache
```
## 📋 Docker Compose Services
### Services Overview

View File

@@ -1,23 +1,31 @@
# SnowWorld Narrowcasting System - Docker Compose Configuration
# SnowWorld Narrowcasting System - Docker Compose Configuration (v2)
version: '3.8'
name: snowworld-narrowcasting
services:
snowworld-narrowcasting:
build: .
build:
context: ../..
dockerfile: deployment/docker/Dockerfile
container_name: snowworld-narrowcasting
ports:
- "3000:3000"
volumes:
- ./database:/app/database
- ./logs:/app/logs
- ./public/uploads:/app/public/uploads
- ../../database:/app/database
- ../../logs:/app/logs
- ../../public/uploads:/app/public/uploads
environment:
- NODE_ENV=production
- PORT=3000
restart: unless-stopped
networks:
- snowworld-network
healthcheck:
test: ["CMD", "node", "-e", "require('http').get('http://localhost:3000/api/zones', (res) => { process.exit(res.statusCode === 200 ? 0 : 1) }).on('error', () => process.exit(1))"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
nginx:
image: nginx:alpine
@@ -26,10 +34,11 @@ services:
- "80:80"
- "443:443"
volumes:
- ./nginx.conf:/etc/nginx/nginx.conf:ro
- ./ssl:/etc/nginx/ssl:ro
- ../configs/nginx.conf:/etc/nginx/nginx.conf:ro
- ../../ssl:/etc/nginx/ssl:ro
depends_on:
- snowworld-narrowcasting
snowworld-narrowcasting:
condition: service_healthy
restart: unless-stopped
networks:
- snowworld-network
@@ -37,8 +46,12 @@ services:
networks:
snowworld-network:
driver: bridge
name: snowworld-network
volumes:
database-data:
name: snowworld-database
uploads-data:
logs-data:
name: snowworld-uploads
logs-data:
name: snowworld-logs