Commit 2b9b5fc2 authored by nimrod's avatar nimrod
Browse files

Merge branch 'vouch-proxy'

parents 33372ca1 836865f0

docker-compose.yml

+50 −32
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
@@ -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'
@@ -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
@@ -79,12 +86,23 @@ services: 
    image: redis:6-alpine

    restart: always



  crond:

    build:

      context: crond/

  vouch:

    depends_on:

      - nextcloud

    environment:

      OAUTH_AUTH_URL: https://nextcloud.shore.co.il/apps/oauth2/authorize

      OAUTH_CALLBACK_URLS: https://vouch.shore.co.il/auth

      OAUTH_CLIENT_ID: "${OAUTH_CLIENT_ID}"

      OAUTH_CLIENT_SECRET: "${OAUTH_CLIENT_SECRET}"  # pragma: allowlist secret

      OAUTH_PROVIDER: nextcloud

      OAUTH_SCOPES: 'openid,email.profile'

      OAUTH_TOKEN_URL: https://nextcloud.shore.co.il/apps/oauth2/api/v1/token

      # yamllint disable-line rule:line-length

      OAUTH_USER_INFO_URL: https://nextcloud.shore.co.il/ocs/v2.php/cloud/user?format=json

      VOUCH_DOMAINS: shore.co.il

      VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}"  # pragma: allowlist secret

    image: registry.hub.docker.com/voucher/vouch-proxy:alpine-0.20.1

    restart: always

    volumes:

      - /run/docker.sock:/run/docker.sock



  z-push:

    build: