cleanup compose

This commit is contained in:
finn 2024-07-08 02:18:20 +00:00
parent 17d2159ddd
commit e0e6bc41fd
2 changed files with 4 additions and 9 deletions

View File

@ -46,6 +46,7 @@ set up cron job for script
proxy - important conf proxy - important conf
backend - app backend - app
gitea - managed primarily by gitea gitea - managed primarily by gitea
pmb-pf - git clone of my mail thing
other - ref and non-sensitive files for dns other - ref and non-sensitive files for dns
### Timeline: ### Timeline:

View File

@ -1,7 +1,6 @@
services: services:
db: db:
image: mariadb:10-focal image: mariadb:10-focal
#command: '--default-authentication-plugin=mysql_native_password'
restart: always restart: always
healthcheck: healthcheck:
test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --password="${DOTENV_MYSQL_ROOT_PASSWORD}" --silent'] test: ['CMD-SHELL', 'mysqladmin ping -h 127.0.0.1 --password="${DOTENV_MYSQL_ROOT_PASSWORD}" --silent']
@ -10,7 +9,7 @@ services:
start_period: 30s start_period: 30s
volumes: volumes:
- db-data:/var/lib/mysql - db-data:/var/lib/mysql
- "./db/init:/docker-entrypoint-initdb.d/" - ./db/init:/docker-entrypoint-initdb.d/
networks: networks:
- backnet - backnet
environment: environment:
@ -65,8 +64,6 @@ services:
- GITEA__mailer__SMTP_PORT=25 - GITEA__mailer__SMTP_PORT=25
- GITEA__service__REGISTER_EMAIL_CONFIRM=true - GITEA__service__REGISTER_EMAIL_CONFIRM=true
- GITEA__service__ENABLE_NOTIFY_MAIL=true - GITEA__service__ENABLE_NOTIFY_MAIL=true
# To disable new users after setup: # To disable new users after setup:
#- GITEA__service__DISABLE_REGISTRATION=false #- GITEA__service__DISABLE_REGISTRATION=false
networks: networks:
@ -103,18 +100,15 @@ services:
args: args:
GPG_PP: $BUILD_GPG_PP GPG_PP: $BUILD_GPG_PP
context: pmb-pf context: pmb-pf
#context: .
dockerfile: Dockerfile dockerfile: Dockerfile
#image: juanluisbaptiste/postfix:latest
expose: expose:
- "25" - "25"
env_file: env_file:
- pmb-pf/.env - ./pmb-pf/.env
#- .env
restart: always restart: always
volumes: volumes:
- pmb-root:/root - pmb-root:/root
- "/etc/localtime:/etc/localtime:ro" - /etc/localtime:/etc/localtime:ro
networks: networks:
- backnet - backnet