diff --git a/.env b/.env index fc6f388a99..d1319d36b9 100644 --- a/.env +++ b/.env @@ -1,5 +1,8 @@ _APP_ENV=production _APP_ENV=development +_APP_SYSTEM_EMAIL_NAME=Appwrite +_APP_SYSTEM_EMAIL_ADDRESS=team@appwrite.io +_APP_SYSTEM_SECURITY_EMAIL_ADDRESS=security@appwrite.io _APP_OPTIONS_ABUSE=disabled _APP_OPTIONS_FORCE_HTTPS=disabled _APP_OPENSSL_KEY_V1=your-secret-key diff --git a/.travis.yml b/.travis.yml index 89db541ea3..c909ec4332 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,7 @@ -language: php +arch: + - amd64 -php: - - '7.4' - -addons: - hosts: - - appwrite.test +os: linux notifications: email: @@ -15,10 +11,11 @@ services: - docker before_install: - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - - sudo apt-get update - - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce + - curl -fsSL https://get.docker.com | sh + - echo '{"experimental":"enabled"}' | sudo tee /etc/docker/daemon.json + - mkdir -p $HOME/.docker + - echo '{"experimental":"enabled"}' | sudo tee $HOME/.docker/config.json + - sudo service docker start # cache: # directories: diff --git a/CHANGES.md b/CHANGES.md index 8607b28fb9..21ee6711cc 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -40,6 +40,9 @@ - Removed user roles attribute from user object (can be fetched from /v1/teams/memberships) ** - Removed type attribute from session object response (used only internally) - ** - might be changed before merging to master +- Upgraded Traefik image to version 2.3 +- Upgraded Redis Docker image to version 6.0 (alpine) +- Upgraded Influxdb Docker image to version 1.8 (alpine) ## Breaking Changes (Read before upgrading!) - **Deprecated** `first` and `last` query params for documents list route in the database API diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml index 5b5b09d5e3..ebd7edf643 100644 --- a/app/views/install/compose.phtml +++ b/app/views/install/compose.phtml @@ -7,7 +7,7 @@ $version = $this->getParam('version', ''); services: traefik: - image: traefik:2.2 + image: traefik:2.3 container_name: appwrite-traefik command: - --providers.file.directory=/storage/config @@ -52,6 +52,9 @@ services: - influxdb environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_OPTIONS_ABUSE - _APP_OPTIONS_FORCE_HTTPS - _APP_OPENSSL_KEY_V1 @@ -119,6 +122,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -139,6 +143,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -185,6 +190,7 @@ services: - appwrite-certificates:/storage/certificates:rw environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -231,6 +237,8 @@ services: - smtp environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_SMTP_HOST @@ -278,7 +286,7 @@ services: - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 redis: - image: redis:5.0 + image: redis:6.0-alpine3.12 container_name: appwrite-redis restart: unless-stopped networks: @@ -296,7 +304,7 @@ services: - appwrite-uploads:/storage/uploads influxdb: - image: influxdb:1.6 + image: influxdb:1.8-alpine container_name: appwrite-influxdb restart: unless-stopped networks: diff --git a/app/workers/certificates.php b/app/workers/certificates.php index 4b81a9ea9a..421bd57019 100644 --- a/app/workers/certificates.php +++ b/app/workers/certificates.php @@ -115,7 +115,7 @@ class CertificatesV1 $staging = (App::isProduction()) ? '' : ' --dry-run'; $response = \shell_exec("certbot certonly --webroot --noninteractive --agree-tos{$staging} \ - --email ".App::getEnv('_APP_SYSTEM_EMAIL_ADDRESS', 'security@localhost.test')." \ + --email ".App::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS', 'security@localhost.test')." \ -w ".APP_STORAGE_CERTIFICATES." \ -d {$domain->get()}"); diff --git a/docker-compose.yml b/docker-compose.yml index eea65f1e28..cb18dc4a65 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: traefik: - image: traefik:2.2 + image: traefik:2.3 container_name: appwrite-traefik command: - --log.level=DEBUG @@ -66,6 +66,9 @@ services: - influxdb environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_OPTIONS_ABUSE - _APP_OPTIONS_FORCE_HTTPS - _APP_OPENSSL_KEY_V1 @@ -137,6 +140,7 @@ services: - request-catcher environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -158,6 +162,7 @@ services: - mariadb environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -207,6 +212,7 @@ services: - appwrite-certificates:/storage/certificates:rw environment: - _APP_ENV + - _APP_SYSTEM_SECURITY_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_DB_HOST @@ -256,6 +262,8 @@ services: # - smtp environment: - _APP_ENV + - _APP_SYSTEM_EMAIL_NAME + - _APP_SYSTEM_EMAIL_ADDRESS - _APP_REDIS_HOST - _APP_REDIS_PORT - _APP_SMTP_HOST @@ -292,6 +300,7 @@ services: - MYSQL_USER=user - MYSQL_PASSWORD=password command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests + # command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu maildev: # used mainly for dev tests image: djfarrelly/maildev @@ -312,17 +321,19 @@ services: - appwrite # smtp: - # image: appwrite/smtp:1.0.1 + # image: appwrite/smtp:1.2.0 # container_name: appwrite-smtp # restart: unless-stopped # networks: # - appwrite # environment: - # - MAILNAME=appwrite - # - RELAY_NETWORKS=:192.168.0.0/24:10.0.0.0/16 - + # - LOCAL_DOMAINS=@ + # - RELAY_FROM_HOSTS=192.168.0.0/16 ; *.yourdomain.com + # - SMARTHOST_HOST=smtp + # - SMARTHOST_PORT=587 + redis: - image: redis:5.0 + image: redis:6.0-alpine container_name: appwrite-redis restart: unless-stopped networks: @@ -338,9 +349,9 @@ services: - appwrite volumes: - appwrite-uploads:/storage/uploads - + influxdb: - image: influxdb:1.6 + image: influxdb:1.8-alpine container_name: appwrite-influxdb restart: unless-stopped networks: diff --git a/docs/tutorials/add-oauth2-provider.md b/docs/tutorials/add-oauth2-provider.md index b7c71b742b..5e1c07dabc 100644 --- a/docs/tutorials/add-oauth2-provider.md +++ b/docs/tutorials/add-oauth2-provider.md @@ -1,6 +1,6 @@ # Adding a New OAuth2 Provider -This document is part of the Appwrite contributors' guide. Before you continue reading this document make sure you have read the [Code of Conduct](../CODE_OF_CONDUCT.md) and the [Contributing Guide](../CONTRIBUTING.md). +This document is part of the Appwrite contributors' guide. Before you continue reading this document make sure you have read the [Code of Conduct](https://github.com/appwrite/appwrite/blob/master/CODE_OF_CONDUCT.md) and the [Contributing Guide](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md). ## Getting Started