diff --git a/dev-mysql.yml b/dev-mysql.yml new file mode 100644 index 0000000..c7506a3 --- /dev/null +++ b/dev-mysql.yml @@ -0,0 +1,85 @@ +services: + database: + container_name: ${CONTAINER_BASENAME}_database + image: mysql:8 #evergreen + networks: + - chevereto + volumes: + - database:/var/lib/mysql + ports: + - ${DB_PORT}:3306 + restart: always + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "--silent"] # MySQL + interval: 10s + timeout: 5s + retries: 3 + environment: + MYSQL_ROOT_PASSWORD: password + MYSQL_DATABASE: chevereto + MYSQL_USER: chevereto + MYSQL_PASSWORD: user_database_password + + php: + container_name: ${CONTAINER_BASENAME}_php + image: ${IMAGE} + networks: + - chevereto + volumes: + - storage:/var/www/html/images/ + - chevereto:/var/www/html/ + - type: bind + source: ${SOURCE} + target: /var/www/chevereto + ports: + - ${HTTP_PORT}:80 + - ${HTTPS_PORT}:443 + restart: always + depends_on: + database: + condition: service_healthy + environment: + CHEVERETO_ENVIRONMENT: dev + CHEVERETO_DB_HOST: database + CHEVERETO_DB_USER: chevereto + CHEVERETO_DB_PASS: user_database_password + CHEVERETO_DB_PORT: 3306 + CHEVERETO_DB_NAME: chevereto + CHEVERETO_HOSTNAME: ${HOSTNAME} + CHEVERETO_HOSTNAME_PATH: ${HOSTNAME_PATH} + CHEVERETO_HTTPS: ${HTTPS} + CHEVERETO_ENCRYPTION_KEY: ${ENCRYPTION_KEY} + CHEVERETO_MAX_POST_SIZE: 2G + CHEVERETO_MAX_UPLOAD_SIZE: 2G + CHEVERETO_SESSION_SAVE_HANDLER: redis + CHEVERETO_SESSION_SAVE_PATH: tcp://redis:6379 + CHEVERETO_ERROR_LOG_CLI: /proc/1/fd/2 + CHEVERETO_ERROR_LOG_CRON: /proc/1/fd/2 + CHEVERETO_ERROR_LOG: /dev/stderr + CHEVERETO_SERVICING: docker + # CHEVERETO_SERVICING: server # uncomment to enable application filesystem upgrades + CHEVERETO_CACHE_DRIVER: redis + CHEVERETO_CACHE_HOST: redis + CHEVERETO_CACHE_PORT: 6379 + CHEVERETO_CACHE_PASSWORD: redis_password + + redis: + container_name: ${CONTAINER_BASENAME}_redis + image: redis:7 + networks: + - chevereto + volumes: + - redis:/data + restart: always + ports: + - ${REDIS_PORT}:6379 + command: redis-server --appendonly yes --requirepass redis_password + +volumes: + database: + storage: + chevereto: + redis: + +networks: + chevereto: diff --git a/dev.yml b/dev.yml index 101e2fd..4a41ec3 100644 --- a/dev.yml +++ b/dev.yml @@ -1,7 +1,7 @@ services: database: container_name: ${CONTAINER_BASENAME}_database - image: mysql + image: mariadb:jammy networks: - chevereto volumes: @@ -10,8 +10,7 @@ services: - ${DB_PORT}:3306 restart: always healthcheck: - # test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect"] # MariaDB - test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1", "--silent"] # MySQL + test: ["CMD", "healthcheck.sh", "--su-mysql", "--connect"] # MariaDB interval: 10s timeout: 5s retries: 3 @@ -52,11 +51,35 @@ services: CHEVERETO_ENCRYPTION_KEY: ${ENCRYPTION_KEY} CHEVERETO_MAX_POST_SIZE: 2G CHEVERETO_MAX_UPLOAD_SIZE: 2G + CHEVERETO_SESSION_SAVE_HANDLER: redis + CHEVERETO_SESSION_SAVE_PATH: tcp://redis:6379 + CHEVERETO_ERROR_LOG_CLI: /proc/1/fd/2 + CHEVERETO_ERROR_LOG_CRON: /proc/1/fd/2 + CHEVERETO_ERROR_LOG: /dev/stderr + CHEVERETO_SERVICING: docker + # CHEVERETO_SERVICING: server # uncomment to enable application filesystem upgrades + CHEVERETO_CACHE_DRIVER: redis + CHEVERETO_CACHE_HOST: redis + CHEVERETO_CACHE_PORT: 6379 + CHEVERETO_CACHE_PASSWORD: redis_password + + redis: + container_name: ${CONTAINER_BASENAME}_redis + image: redis:7 + networks: + - chevereto + volumes: + - redis:/data + restart: always + ports: + - ${REDIS_PORT}:6379 + command: redis-server --appendonly yes --requirepass redis_password volumes: database: storage: chevereto: + redis: networks: chevereto: