Loading docker-compose.yml +34 −34 Original line number Diff line number Diff line --- version: '3.5' services: crond: build: context: crond/ restart: always volumes: - /run/docker.sock:/run/docker.sock mysql: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW environment: MYSQL_DATABASE: &mysql_database nextcloud # yamllint disable-line rule:line-length MYSQL_PASSWORD: &mysql_password ${MYSQL_PASSWORD:-foo} # pragma: allowlist secret # yamllint disable-line rule:line-length MYSQL_ROOT_PASSWORD: &mysql_root_password ${MYSQL_ROOT_PASSWORD:-bar} # pragma: allowlist secret MYSQL_USER: &mysql_user nextcloud healthcheck: start_period: 1m test: - CMD-SHELL - >- mysql --user "$$MYSQL_USER" "--password=$$MYSQL_PASSWORD" --execute 'SHOW DATABASES;' || exit 1 image: mariadb:10 restart: always volumes: - mysql:/var/lib/mysql nextcloud: depends_on: - mysql Loading @@ -9,11 +40,10 @@ services: environment: MAIL_FROM_ADDRESS: noreply@shore.co.il MAIL_DOMAIN: shore.co.il MYSQL_DATABASE: &mysql_database nextcloud MYSQL_DATABASE: *mysql_database MYSQL_HOST: mysql # yamllint disable-line rule:line-length MYSQL_PASSWORD: &mysql_password ${MYSQL_PASSWORD:-foo} # pragma: allowlist secret MYSQL_USER: &mysql_user nextcloud MYSQL_PASSWORD: *mysql_password # pragma: allowlist secret MYSQL_USER: *mysql_user NEXTCLOUD_ADMIN_USER: admin NEXTCLOUD_ADMIN_PASSWORD: "${NEXTCLOUD_ADMIN_PASSWORD:-baz}" NEXTCLOUD_TRUSTED_DOMAINS: '*.shore.co.il shore.co.il' Loading Loading @@ -41,29 +71,6 @@ services: - _run_slapd:/run/slapd - _run_clamav:/run/clamav mysql: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW environment: MYSQL_DATABASE: *mysql_database MYSQL_PASSWORD: *mysql_password # pragma: allowlist secret # yamllint disable-line rule:line-length MYSQL_ROOT_PASSWORD: &mysql_root_password ${MYSQL_ROOT_PASSWORD:-bar} # pragma: allowlist secret MYSQL_USER: *mysql_user healthcheck: start_period: 1m test: - CMD-SHELL - >- mysql --user "$$MYSQL_USER" "--password=$$MYSQL_PASSWORD" --execute 'SHOW DATABASES;' || exit 1 image: mariadb:10 restart: always volumes: - mysql:/var/lib/mysql redis: command: - redis-server Loading @@ -79,13 +86,6 @@ services: image: redis:6-alpine restart: always crond: build: context: crond/ restart: always volumes: - /run/docker.sock:/run/docker.sock z-push: build: context: z-push Loading Loading
docker-compose.yml +34 −34 Original line number Diff line number Diff line --- version: '3.5' services: crond: build: context: crond/ restart: always volumes: - /run/docker.sock:/run/docker.sock mysql: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW environment: MYSQL_DATABASE: &mysql_database nextcloud # yamllint disable-line rule:line-length MYSQL_PASSWORD: &mysql_password ${MYSQL_PASSWORD:-foo} # pragma: allowlist secret # yamllint disable-line rule:line-length MYSQL_ROOT_PASSWORD: &mysql_root_password ${MYSQL_ROOT_PASSWORD:-bar} # pragma: allowlist secret MYSQL_USER: &mysql_user nextcloud healthcheck: start_period: 1m test: - CMD-SHELL - >- mysql --user "$$MYSQL_USER" "--password=$$MYSQL_PASSWORD" --execute 'SHOW DATABASES;' || exit 1 image: mariadb:10 restart: always volumes: - mysql:/var/lib/mysql nextcloud: depends_on: - mysql Loading @@ -9,11 +40,10 @@ services: environment: MAIL_FROM_ADDRESS: noreply@shore.co.il MAIL_DOMAIN: shore.co.il MYSQL_DATABASE: &mysql_database nextcloud MYSQL_DATABASE: *mysql_database MYSQL_HOST: mysql # yamllint disable-line rule:line-length MYSQL_PASSWORD: &mysql_password ${MYSQL_PASSWORD:-foo} # pragma: allowlist secret MYSQL_USER: &mysql_user nextcloud MYSQL_PASSWORD: *mysql_password # pragma: allowlist secret MYSQL_USER: *mysql_user NEXTCLOUD_ADMIN_USER: admin NEXTCLOUD_ADMIN_PASSWORD: "${NEXTCLOUD_ADMIN_PASSWORD:-baz}" NEXTCLOUD_TRUSTED_DOMAINS: '*.shore.co.il shore.co.il' Loading Loading @@ -41,29 +71,6 @@ services: - _run_slapd:/run/slapd - _run_clamav:/run/clamav mysql: command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW environment: MYSQL_DATABASE: *mysql_database MYSQL_PASSWORD: *mysql_password # pragma: allowlist secret # yamllint disable-line rule:line-length MYSQL_ROOT_PASSWORD: &mysql_root_password ${MYSQL_ROOT_PASSWORD:-bar} # pragma: allowlist secret MYSQL_USER: *mysql_user healthcheck: start_period: 1m test: - CMD-SHELL - >- mysql --user "$$MYSQL_USER" "--password=$$MYSQL_PASSWORD" --execute 'SHOW DATABASES;' || exit 1 image: mariadb:10 restart: always volumes: - mysql:/var/lib/mysql redis: command: - redis-server Loading @@ -79,13 +86,6 @@ services: image: redis:6-alpine restart: always crond: build: context: crond/ restart: always volumes: - /run/docker.sock:/run/docker.sock z-push: build: context: z-push Loading