fix kimai
This commit is contained in:
		@@ -6,24 +6,20 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
services:
 | 
					services:
 | 
				
			||||||
  mysql:
 | 
					  mysql:
 | 
				
			||||||
    image: mysql:8.3
 | 
					    image: mysql:8
 | 
				
			||||||
    container_name: kimai_db
 | 
					 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - mysql:/var/lib/mysql
 | 
					      - kimai-mysql-data:/var/lib/mysql
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - MYSQL_DATABASE=${MYSQL_DATABASE:-kimai}
 | 
					      - MYSQL_DATABASE=${MYSQL_DATABASE:-kimai}
 | 
				
			||||||
      - MYSQL_USER=${MYSQL_USER:-kimaiuser}
 | 
					      - MYSQL_USER=${SERVICE_USER_MYSQL}
 | 
				
			||||||
      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
 | 
					      - MYSQL_PASSWORD=${SERVICE_PASSWORD_MYSQL}
 | 
				
			||||||
      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_MYSQL_ROOT}
 | 
					      - MYSQL_ROOT_PASSWORD=${SERVICE_PASSWORD_ROOT}
 | 
				
			||||||
    command: --default-storage-engine innodb
 | 
					    command: --default-storage-engine innodb
 | 
				
			||||||
    restart: unless-stopped
 | 
					 | 
				
			||||||
    healthcheck:
 | 
					    healthcheck:
 | 
				
			||||||
      test: mysqladmin -p$$MYSQL_ROOT_PASSWORD ping -h localhost
 | 
					      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1"]
 | 
				
			||||||
      interval: 20s
 | 
					      interval: 5s
 | 
				
			||||||
      start_period: 10s
 | 
					      timeout: 20s
 | 
				
			||||||
      timeout: 10s
 | 
					      retries: 10
 | 
				
			||||||
      retries: 3
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  kimai:
 | 
					  kimai:
 | 
				
			||||||
    image: kimai/kimai2:apache-latest
 | 
					    image: kimai/kimai2:apache-latest
 | 
				
			||||||
    container_name: kimai
 | 
					    container_name: kimai
 | 
				
			||||||
@@ -31,22 +27,18 @@ services:
 | 
				
			|||||||
      mysql:
 | 
					      mysql:
 | 
				
			||||||
        condition: service_healthy
 | 
					        condition: service_healthy
 | 
				
			||||||
    volumes:
 | 
					    volumes:
 | 
				
			||||||
      - data:/opt/kimai/var/data
 | 
					      - kimai-data:/opt/kimai/var/data
 | 
				
			||||||
    environment:
 | 
					    environment:
 | 
				
			||||||
      - SERVICE_FQDN_KIMAI
 | 
					      - SERVICE_FQDN_KIMAI_8001
 | 
				
			||||||
      - APP_SECRET=${SERVICE_PASSWORD_APP_SECRET}
 | 
					      - APP_SECRET=${SERVICE_PASSWORD_APPSECRET}
 | 
				
			||||||
      - MAILER_FROM=${MAILER_FROM:-kimai@example.com}
 | 
					      - MAILER_FROM=${MAILER_FROM:-kimai@example.com}
 | 
				
			||||||
      - MAILER_URL=${MAILER_URL:-null://null}
 | 
					      - MAILER_URL=${MAILER_URL:-null://null}
 | 
				
			||||||
      - ADMINMAIL=${ADMINMAIL:-admin@kimai.local}
 | 
					      - ADMINMAIL=${ADMINMAIL:-admin@kimai.local}
 | 
				
			||||||
      - ADMINPASS=${SERVICE_PASSWORD_ADMINPASS}
 | 
					      - ADMINPASS=${SERVICE_PASSWORD_ADMINPASS}
 | 
				
			||||||
      - DATABASE_URL=mysql://${MYSQL_USER}:${SERVICE_PASSWORD_MYSQL}@mysql/${MYSQL_DATABASE}?charset=utf8mb4&serverVersion=8.3.0
 | 
					      - DATABASE_URL=mysql://${SERVICE_USER_MYSQL}:${SERVICE_PASSWORD_MYSQL}@mysql/${MYSQL_DATABASE}?charset=utf8mb4&serverVersion=8.3.0
 | 
				
			||||||
      - TRUSTED_HOSTS=localhost
 | 
					      - TRUSTED_HOSTS=localhost
 | 
				
			||||||
    restart: unless-stopped
 | 
					    healthcheck:
 | 
				
			||||||
    labels:
 | 
					      test: ["CMD", "curl", "-f", "http://127.0.0.1:8001"]
 | 
				
			||||||
      - traefik.enable=true
 | 
					      interval: 2s
 | 
				
			||||||
      - traefik.http.routers.kimai.entryPoints=http
 | 
					      timeout: 10s
 | 
				
			||||||
      - traefik.http.services.kimai.loadbalancer.server.port=8001
 | 
					      retries: 15
 | 
				
			||||||
 | 
					 | 
				
			||||||
volumes:
 | 
					 | 
				
			||||||
  data:
 | 
					 | 
				
			||||||
  mysql:
 | 
					 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user