chore: make root compose file the Portainer stack
All checks were successful
CI / Validate frontend and API (push) Successful in 28s
All checks were successful
CI / Validate frontend and API (push) Successful in 28s
This commit is contained in:
@@ -5,7 +5,7 @@ The project now has a small API and a PostgreSQL schema. Video delivery is provi
|
|||||||
## Local setup
|
## Local setup
|
||||||
|
|
||||||
1. Copy `.env.example` to `.env` and use the default local values.
|
1. Copy `.env.example` to `.env` and use the default local values.
|
||||||
2. Start PostgreSQL with `docker compose up -d postgres`.
|
2. Start PostgreSQL with `docker compose -f docker-compose.dev.yml up -d postgres`.
|
||||||
3. Install dependencies with `npm install`.
|
3. Install dependencies with `npm install`.
|
||||||
4. Apply the versioned schema with `npm run db:migrate`.
|
4. Apply the versioned schema with `npm run db:migrate`.
|
||||||
5. Run the API with `npm run dev:api` and the frontend with `npm run dev`.
|
5. Run the API with `npm run dev:api` and the frontend with `npm run dev`.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Portainer deployment
|
# Portainer deployment
|
||||||
|
|
||||||
Use `docker-compose.portainer.yml` as a Portainer Stack from this repository. It deploys the frontend, API, and PostgreSQL as one internal Docker network. Only the web container exposes a port; it proxies `/api` to the API container.
|
Use `docker-compose.yml` as a Portainer Stack from this repository. It deploys the frontend, API, and PostgreSQL as one internal Docker network. Only the web container exposes a port; it proxies `/api` to the API container.
|
||||||
|
|
||||||
## Required Portainer environment variables
|
## Required Portainer environment variables
|
||||||
|
|
||||||
|
|||||||
19
docker-compose.dev.yml
Normal file
19
docker-compose.dev.yml
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
services:
|
||||||
|
postgres:
|
||||||
|
image: postgres:16-alpine
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: compor_hub
|
||||||
|
POSTGRES_USER: compor
|
||||||
|
POSTGRES_PASSWORD: compor_local_password
|
||||||
|
ports:
|
||||||
|
- "5433:5432"
|
||||||
|
volumes:
|
||||||
|
- compor_postgres_data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U compor -d compor_hub"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 10
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
compor_postgres_data:
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
services:
|
|
||||||
postgres:
|
|
||||||
image: postgres:16-alpine
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
POSTGRES_DB: ${POSTGRES_DB:-compor_hub}
|
|
||||||
POSTGRES_USER: ${POSTGRES_USER:-compor}
|
|
||||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in Portainer}
|
|
||||||
volumes:
|
|
||||||
- compor_postgres_data:/var/lib/postgresql/data
|
|
||||||
healthcheck:
|
|
||||||
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
|
|
||||||
interval: 10s
|
|
||||||
timeout: 5s
|
|
||||||
retries: 10
|
|
||||||
|
|
||||||
api:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile.api
|
|
||||||
restart: unless-stopped
|
|
||||||
environment:
|
|
||||||
APP_ENV: production
|
|
||||||
API_PORT: 3001
|
|
||||||
FRONTEND_ORIGIN: ${FRONTEND_ORIGIN:?Set the public https URL in Portainer}
|
|
||||||
DATABASE_URL: postgresql://${POSTGRES_USER:-compor}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-compor_hub}
|
|
||||||
JWT_SECRET: ${JWT_SECRET:?Set a long random JWT_SECRET in Portainer}
|
|
||||||
depends_on:
|
|
||||||
postgres:
|
|
||||||
condition: service_healthy
|
|
||||||
|
|
||||||
web:
|
|
||||||
build:
|
|
||||||
context: .
|
|
||||||
dockerfile: Dockerfile.web
|
|
||||||
restart: unless-stopped
|
|
||||||
ports:
|
|
||||||
- "${WEB_PORT:-8080}:80"
|
|
||||||
depends_on:
|
|
||||||
- api
|
|
||||||
|
|
||||||
volumes:
|
|
||||||
compor_postgres_data:
|
|
||||||
@@ -1,19 +1,43 @@
|
|||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
|
restart: unless-stopped
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_DB: compor_hub
|
POSTGRES_DB: ${POSTGRES_DB:-compor_hub}
|
||||||
POSTGRES_USER: compor
|
POSTGRES_USER: ${POSTGRES_USER:-compor}
|
||||||
POSTGRES_PASSWORD: compor_local_password
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?Set POSTGRES_PASSWORD in Portainer}
|
||||||
ports:
|
|
||||||
- "5433:5432"
|
|
||||||
volumes:
|
volumes:
|
||||||
- compor_postgres_data:/var/lib/postgresql/data
|
- compor_postgres_data:/var/lib/postgresql/data
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "pg_isready -U compor -d compor_hub"]
|
test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
|
||||||
interval: 5s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 10
|
retries: 10
|
||||||
|
|
||||||
|
api:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile.api
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
APP_ENV: production
|
||||||
|
API_PORT: 3001
|
||||||
|
FRONTEND_ORIGIN: ${FRONTEND_ORIGIN:?Set the public https URL in Portainer}
|
||||||
|
DATABASE_URL: postgresql://${POSTGRES_USER:-compor}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB:-compor_hub}
|
||||||
|
JWT_SECRET: ${JWT_SECRET:?Set a long random JWT_SECRET in Portainer}
|
||||||
|
depends_on:
|
||||||
|
postgres:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
|
web:
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile.web
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "${WEB_PORT:-8080}:80"
|
||||||
|
depends_on:
|
||||||
|
- api
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
compor_postgres_data:
|
compor_postgres_data:
|
||||||
|
|||||||
Reference in New Issue
Block a user