cleanup compose
This commit is contained in:
		@@ -46,6 +46,7 @@ set up cron job for script
 | 
			
		||||
        proxy - important conf
 | 
			
		||||
        backend - app
 | 
			
		||||
        gitea - managed primarily by gitea
 | 
			
		||||
        pmb-pf - git clone of my mail thing
 | 
			
		||||
        other - ref and non-sensitive files for dns
 | 
			
		||||
 | 
			
		||||
### Timeline:
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										12
									
								
								compose.yaml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								compose.yaml
									
									
									
									
									
								
							@@ -1,7 +1,6 @@
 | 
			
		||||
services:
 | 
			
		||||
  db:
 | 
			
		||||
    image: mariadb:10-focal
 | 
			
		||||
    #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']
 | 
			
		||||
@@ -10,7 +9,7 @@ services:
 | 
			
		||||
      start_period: 30s
 | 
			
		||||
    volumes:
 | 
			
		||||
      - db-data:/var/lib/mysql
 | 
			
		||||
      - "./db/init:/docker-entrypoint-initdb.d/"
 | 
			
		||||
      - ./db/init:/docker-entrypoint-initdb.d/
 | 
			
		||||
    networks:
 | 
			
		||||
      - backnet
 | 
			
		||||
    environment:
 | 
			
		||||
@@ -65,8 +64,6 @@ services:
 | 
			
		||||
      - GITEA__mailer__SMTP_PORT=25
 | 
			
		||||
      - GITEA__service__REGISTER_EMAIL_CONFIRM=true
 | 
			
		||||
      - GITEA__service__ENABLE_NOTIFY_MAIL=true
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
      # To disable new users after setup:
 | 
			
		||||
      #- GITEA__service__DISABLE_REGISTRATION=false
 | 
			
		||||
    networks:
 | 
			
		||||
@@ -103,18 +100,15 @@ services:
 | 
			
		||||
      args:
 | 
			
		||||
        GPG_PP: $BUILD_GPG_PP
 | 
			
		||||
      context: pmb-pf
 | 
			
		||||
      #context: .
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
    #image: juanluisbaptiste/postfix:latest
 | 
			
		||||
    expose:
 | 
			
		||||
      - "25"
 | 
			
		||||
    env_file:
 | 
			
		||||
      - pmb-pf/.env
 | 
			
		||||
      #- .env
 | 
			
		||||
      - ./pmb-pf/.env
 | 
			
		||||
    restart: always
 | 
			
		||||
    volumes:
 | 
			
		||||
      - pmb-root:/root
 | 
			
		||||
      - "/etc/localtime:/etc/localtime:ro"
 | 
			
		||||
      - /etc/localtime:/etc/localtime:ro
 | 
			
		||||
    networks:
 | 
			
		||||
      - backnet
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user