Compare commits

..

No commits in common. "c63db45025b50d9a3b7119a1f24799fd51a66ce3" and "25e5b5a5b67e58abfe1f2dec3eeecf2abfc53c7d" have entirely different histories.

2 changed files with 2 additions and 32 deletions

3
.gitignore vendored
View File

@ -1,4 +1,3 @@
gitea/
gitea/*
.env
pmb-pf/

View File

@ -4,7 +4,7 @@ services:
#command: '--default-authentication-plugin=mysql_native_password'
restart: always
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="rootpass" --silent']
interval: 3s
retries: 5
start_period: 30s
@ -57,13 +57,6 @@ services:
- GITEA__database__USER=gitea
- GITEA__database__PASSWD=${DOTENV_MYSQL_GITEA_PASSWORD}
- GITEA__repository__DEFAULT_BRANCH=master
- GITEA__mailer__ENABLED=true
- GITEA__mailer__FROM=${GITEA_MAIL_FROM}
- GITEA__mailer__USER=
- GITEA__mailer__PROTOCOL=smtp
- GITEA__mailer__SMTP_ADDR=pmb
- GITEA__mailer__SMTP_PORT=25
# To disable new users after setup:
#- GITEA__service__DISABLE_REGISTRATION=false
networks:
@ -95,30 +88,8 @@ services:
networks:
- frontnet
pmb:
build:
args:
GPG_PP: $BUILD_GPG_PP
context: pmb-pf
#context: .
dockerfile: Dockerfile
#image: juanluisbaptiste/postfix:latest
expose:
- "25"
env_file:
- pmb-pf/.env
#- .env
restart: always
volumes:
- pmb-root:/root
- "/etc/localtime:/etc/localtime:ro"
networks:
- backnet
volumes:
db-data:
pmb-root:
networks:
backnet: