Added container helper to compose. Updated dockerfile to use bun. Smaller adjustments
This commit is contained in:
58
compose.yml
58
compose.yml
@@ -11,6 +11,7 @@
|
||||
args:
|
||||
HTTP_PROXY: ${HTTP_PROXY}
|
||||
HTTPS_PROXY: ${HTTPS_PROXY}
|
||||
GIT_BRANCH: ${GIT_BRANCH:-v2.1}
|
||||
|
||||
# Requirements
|
||||
depends_on:
|
||||
@@ -40,31 +41,66 @@
|
||||
- "Moonlight__OIDC__Scopes__0=openid"
|
||||
- "Moonlight__OIDC__Scopes__1=identify"
|
||||
- "Moonlight__OIDC__Scopes__2=email"
|
||||
|
||||
# Container Helper
|
||||
- "Moonlight__ContainerHelper__IsEnabled=true"
|
||||
- "Moonlight__ContainerHelper__Url=http://helper:8080"
|
||||
|
||||
# Logging
|
||||
- "Logging__LogLevel__Default=Information"
|
||||
- "Logging__LogLevel__Microsoft.AspNetCore=Warning"
|
||||
- "Logging__LogLevel__System.Net.Http.HttpClient=Warning"
|
||||
|
||||
# HTTP Proxy
|
||||
- "HTTP_PROXY=${HTTP_PROXY}"
|
||||
- "HTTPS_PROXY=${HTTPS_PROXY}"
|
||||
- "NO_PROXY=database,helper"
|
||||
|
||||
database:
|
||||
image: postgres:18.1
|
||||
|
||||
networks:
|
||||
- moonlight
|
||||
|
||||
environment:
|
||||
- "POSTGRES_USER=${DATABASE_USERNAME}"
|
||||
- "POSTGRES_PASSWORD=${DATABASE_PASSWORD}"
|
||||
- "POSTGRES_DB=${DATABASE_DATABASE}"
|
||||
|
||||
volumes:
|
||||
- ${DATA_PATH}/database:/var/lib/postgresql
|
||||
|
||||
healthcheck:
|
||||
test: [ "CMD", "pg_isready", "-q", "-d", "${DATABASE_DATABASE}", "-U", "${DATABASE_USERNAME}" ]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
||||
helper:
|
||||
image: git.battlestati.one/moonlight-panel/container_helper
|
||||
|
||||
group_add:
|
||||
- "${DOCKER_GID}"
|
||||
|
||||
networks:
|
||||
- moonlight
|
||||
|
||||
environment:
|
||||
- "POSTGRES_USER=${DATABASE_USERNAME}"
|
||||
- "POSTGRES_PASSWORD=${DATABASE_PASSWORD}"
|
||||
- "POSTGRES_DB=${DATABASE_DATABASE}"
|
||||
- "PGDATA=/pgdata"
|
||||
# Logging
|
||||
- "Logging__LogLevel__Default=Information"
|
||||
- "Logging__LogLevel__Microsoft.AspNetCore=Warning"
|
||||
|
||||
# Compose
|
||||
- "ContainerHelper__Compose__Directory=${PWD}"
|
||||
- "ContainerHelper__Compose__Binary=docker-compose"
|
||||
|
||||
# HTTP Proxy
|
||||
- "HTTP_PROXY=${HTTP_PROXY}"
|
||||
- "HTTPS_PROXY=${HTTPS_PROXY}"
|
||||
|
||||
volumes:
|
||||
- ./data/database:/var/lib/postgresql/data
|
||||
|
||||
healthcheck:
|
||||
test: [ "CMD", "pg_isready", "-q", "-d", $DATABASE_DATABASE, "-U", $DATABASE_USERNAME]
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
- "${PWD}:${PWD}"
|
||||
- "/var/run/docker.sock:/var/run/docker.sock"
|
||||
|
||||
networks:
|
||||
moonlight:
|
||||
Reference in New Issue
Block a user