more env vars declarations in docker and README explanations for them

docker/README.md

@@ -178,33 +178,34 @@ You can specify the following environment variables when issuing `docker run` co
 
 | Variable | Type | Default | Function |
 | --- | --- | --- | --- |
+| `ACC_GC_ENABLED` | bool | `false` | Enable/diable automatic deletion of unfinished account registrations. |
 | `AUTH_TOKEN_KEY` | string | `wfaY2RgF2S1OQI/ZlK+LS​rp1KB2jwAdGAIHQ7JZn+Kc=` | base64-encoded 32 random bytes used as salt for authentication tokens. |
-| `AWS_ACCESS_KEY_ID` | string |  | AWS Access Key ID when using `s3` media handler |
+| `AWS_ACCESS_KEY_ID` | string |  | AWS Access Key ID when using `s3` media handler. |
 | `AWS_CORS_ORIGINS` | string | `["*"]` | Allowed origins ([CORS](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Allow-Origin)) URL for downloads. Generally use your server URL and its aliases. |
 | `AWS_REGION` | string |  | AWS Region when using `s3` media handler |
-| `AWS_S3_BUCKET` | string |  | Name of the AWS S3 bucket when using `s3` media handler |
-| `AWS_SECRET_ACCESS_KEY` | string |  | AWS [Secret Access Key](https://aws.amazon.com/blogs/security/wheres-my-secret-access-key/) when using `s3` media handler |
-| `CLUSTER_SELF` | string |  | Node name if the server is running in a Tinode cluster |
+| `AWS_S3_BUCKET` | string |  | Name of the AWS S3 bucket when using `s3` media handler. |
+| `AWS_SECRET_ACCESS_KEY` | string |  | AWS [Secret Access Key](https://aws.amazon.com/blogs/security/wheres-my-secret-access-key/) when using `s3` media handler. |
+| `CLUSTER_SELF` | string |  | Node name if the server is running in a Tinode cluster. |
 | `DEBUG_EMAIL_VERIFICATION_CODE` | string |  | Enable dummy email verification code, e.g. `123456`. Disabled by default (empty string). |
-| `DEFAULT_COUNTRY_CODE` | string | `"US"` | 2-letter country code to assign to sessions by default when the country isn't specified by the client explicitly and it's impossible to infer it. |
+| `DEFAULT_COUNTRY_CODE` | string | `US` | 2-letter country code to assign to sessions by default when the country isn't specified by the client explicitly and it's impossible to infer it. |
 | `EXT_CONFIG` | string |  | Path to external config file to use instead of the built-in one. If this parameter is used all other variables except `RESET_DB`, `FCM_SENDER_ID`, `FCM_VAPID_KEY` are ignored. |
-| `EXT_STATIC_DIR` | string |  | Path to external directory containing static data (e.g. Tinode Webapp files) |
+| `EXT_STATIC_DIR` | string |  | Path to external directory containing static data (e.g. Tinode Webapp files). |
 | `FCM_CRED_FILE` | string |  | Path to JSON file with FCM server-side service account credentials which will be used to send push notifications. |
-| `FCM_API_KEY` | string |  | Firebase API key; required for receiving push notifications in the web client |
-| `FCM_APP_ID` | string |  | Firebase web app ID; required for receiving push notifications in the web client |
-| `FCM_PROJECT_ID` | string |  | Firebase project ID; required for receiving push notifications in the web client |
-| `FCM_SENDER_ID` | string |  | Firebase FCM sender ID; required for receiving push notifications in the web client |
+| `FCM_API_KEY` | string |  | Firebase API key; required for receiving push notifications in the web client. |
+| `FCM_APP_ID` | string |  | Firebase web app ID; required for receiving push notifications in the web client. |
+| `FCM_PROJECT_ID` | string |  | Firebase project ID; required for receiving push notifications in the web client. |
+| `FCM_SENDER_ID` | string |  | Firebase FCM sender ID; required for receiving push notifications in the web client. |
 | `FCM_VAPID_KEY` | string |  | Also called 'Web Client certificate' in the FCM console; required by the web client to receive push notifications. |
 | `FCM_INCLUDE_ANDROID_NOTIFICATION` | boolean | true | If true, pushes a data + notification message, otherwise a data-only message. [More info](https://firebase.google.com/docs/cloud-messaging/concept-options). |
 | `FCM_MEASUREMENT_ID` | string |  | Google Analytics ID of the form `G-123ABCD789`. |
 | `FS_CORS_ORIGINS` | string | `["*"]` | Cors origins when media is served from the file system. See `AWS_CORS_ORIGINS` for details. |
 | `ICE_SERVERS_FILE` | string |  | Path to JSON file with configuration of ICE servers to be used for video calls. |
-| `MEDIA_HANDLER` | string | `fs` | Handler of large files, either `fs` or `s3` |
+| `MEDIA_HANDLER` | string | `fs` | Handler of large files, either `fs` or `s3`. |
 | `MYSQL_DSN` | string | `'root@tcp(mysql)/tinode'` | MySQL [DSN](https://github.com/go-sql-driver/mysql#dsn-data-source-name). |
-| `PLUGIN_PYTHON_CHAT_BOT_ENABLED` | bool | `false` | Enable calling into the plugin provided by Python chatbot |
+| `PLUGIN_PYTHON_CHAT_BOT_ENABLED` | bool | `false` | Enable calling into the plugin provided by Python chatbot. |
 | `POSTGRES_DSN` | string | `'postgresql://postgres:postgres@localhost:5432/tinode'` |  PostgreSQL [DSN](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING). |
 | `RESET_DB` | bool | `false` | Drop and recreate the database. |
-| `SAMPLE_DATA` | string |  _see comment →_ | File with sample data to load. Default `data.json` when resetting or generating new DB, none when upgrading. Use `` (empty string) to disable |
+| `SAMPLE_DATA` | string |  _see comment →_ | File with sample data to load. Default `data.json` when resetting or generating new DB, none when upgrading. Use `` (empty string) to disable. |
 | `SMTP_AUTH_MECHANISM` | string | `"plain"` | SMTP authentication mechanism to use; one of "login", "cram-md5", "plain". |
 | `SMTP_DOMAINS` | string |  | White list of email domains; when non-empty, accept registrations with emails from these domains only (email verification). |
 | `SMTP_HELO_HOST` | string | _see comment →_ | FQDN to use in SMTP HELO/EHLO command; if missing, the hostname from `SMTP_HOST_URL` is used. |
@@ -214,11 +215,13 @@ You can specify the following environment variables when issuing `docker run` co
 | `SMTP_PORT` | number |  | Port number of the SMTP server to use for sending verification emails, e.g. `25` or `587`. |
 | `SMTP_SENDER` | string |  | [RFC 5322](https://tools.ietf.org/html/rfc5322) email address to use in the `FROM` field of verification emails, e.g. `'"John Doe" <jdoe@example.com>'`. |
 | `SMTP_SERVER` | string |  | Name of the SMTP server to use for sending verification emails, e.g. `smtp.gmail.com`. If SMTP_SERVER is not defined, email verification will be disabled. |
-| `STORE_USE_ADAPTER` | string |  | DB adapter name (specify with `tinode/tinode` container only) |
-| `TEL_HOST_URL` | string | `'http://localhost:6060/'` | URL of the host where the webapp is running (phone verification).  |
+| `STORE_USE_ADAPTER` | string |  | DB adapter name (specify with `tinode/tinode` container only). |
+| `TEL_HOST_URL` | string | `'http://localhost:6060/'` | URL of the host where the webapp is running for phone verification. |
 | `TEL_SENDER` | string |  | Sender name to pass to SMS sending service. |
 | `TLS_CONTACT_ADDRESS` | string |  | Optional email to use as contact for [LetsEncrypt](https://letsencrypt.org/) certificates, e.g. `jdoe@example.com`. |
 | `TLS_DOMAIN_NAME` | string |  | If non-empty, enables TLS (http**s**) and configures domain name of your container, e.g. `www.example.com`. In order for TLS to work you have to expose your HTTPS port to the Internet and correctly configure DNS. It WILL FAIL with `localhost` or unroutable IPs. |
+| `TNPG_AUTH_TOKEN` | string |  | Tinode Push Gateway authentication token. |
+| `TNPG_ORG` | string |  | Tinode Push Gateway organization name as registered at https://console.tinode.co |
 | `UID_ENCRYPTION_KEY` | string | `la6YsO+bNX/+XIkOqc5Svw==` | base64-encoded 16 random bytes used as an encryption key for user IDs. |
 | `UPGRADE_DB` | bool | `false` | Upgrade database schema, if necessary. |
 | `WAIT_FOR` | string |  | If non-empty, waits for the specified database `host:port` to be available before starting the server. |

docker/tinode/Dockerfile

@@ -47,6 +47,9 @@ ENV NO_DB_INIT=false
 ARG SAMPLE_DATA=data.json
 ENV SAMPLE_DATA=$SAMPLE_DATA
 
+# Default country code to use in communication.
+ENV DEFAULT_COUNTRY_CODE=US
+
 # The MySQL DSN connection.
 ENV MYSQL_DSN='root@tcp(mysql)/tinode'
 
@@ -59,11 +62,28 @@ ENV PLUGIN_PYTHON_CHAT_BOT_ENABLED=false
 # Default handler for large files
 ENV MEDIA_HANDLER=fs
 
-# Whitelisted domains for S3 large media handler.
+# Whitelisted domains for file and S3 large media handler.
+ENV FS_CORS_ORIGINS='["*"]'
 ENV AWS_CORS_ORIGINS='["*"]'
 
+# AWS S3 parameters
+ENV AWS_ACCESS_KEY_ID=
+ENV AWS_SECRET_ACCESS_KEY=
+ENV AWS_REGION=
+ENV AWS_S3_BUCKET=
+
 # Default externally-visible hostname for email verification.
 ENV SMTP_HOST_URL='http://localhost:6060'
+# Email parameters decalarations.
+ENV SMTP_SERVER=
+ENV SMTP_PORT=
+ENV SMTP_SENDER=
+ENV SMTP_LOGIN=
+ENV SMTP_PASSWORD=
+ENV SMTP_AUTH_MECHANISM=
+ENV SMTP_HELO_HOST=
+ENV EMAIL_VERIFICATION_REQUIRED=
+ENV DEBUG_EMAIL_VERIFICATION_CODE=
 
 # Whitelist of permitted email domains for email verification (empty list means all domains are permitted)
 ENV SMTP_DOMAINS=''
@@ -82,6 +102,8 @@ ENV UID_ENCRYPTION_KEY=la6YsO+bNX/+XIkOqc5Svw==
 
 # Disable TLS by default.
 ENV TLS_ENABLED=false
+ENV TLS_DOMAIN_NAME=
+ENV TLS_CONTACT_ADDRESS=
 
 # Disable push notifications by default.
 ENV FCM_PUSH_ENABLED=false
@@ -117,6 +139,9 @@ ENV STORE_USE_ADAPTER=$TARGET_DB
 # Url path for exposing the server's internal status. E.g. '/status'
 ENV SERVER_STATUS_PATH=''
 
+# Garbage collection of unfinished account registrations.
+ENV ACC_GC_ENABLED=false
+
 # Install root certificates, they are needed for email validator to work
 # with the TLS SMTP servers like Gmail or Mailjet. Also add bash and grep.
 RUN apk update && \