diff options
Diffstat (limited to 'support/docker')
-rw-r--r-- | support/docker/production/.env | 1 | ||||
-rw-r--r-- | support/docker/production/Dockerfile.buster | 2 | ||||
-rw-r--r-- | support/docker/production/config/custom-environment-variables.yaml | 3 | ||||
-rw-r--r-- | support/docker/production/config/production.yaml | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/support/docker/production/.env b/support/docker/production/.env index 3e19c3817..70743e0ec 100644 --- a/support/docker/production/.env +++ b/support/docker/production/.env | |||
@@ -8,6 +8,7 @@ POSTGRES_DB=peertube | |||
8 | #PEERTUBE_DB_SUFFIX=_prod | 8 | #PEERTUBE_DB_SUFFIX=_prod |
9 | PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> | 9 | PEERTUBE_DB_USERNAME=<MY POSTGRES USERNAME> |
10 | PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> | 10 | PEERTUBE_DB_PASSWORD=<MY POSTGRES PASSWORD> |
11 | PEERTUBE_DB_SSL=false | ||
11 | # Default to Postgres service name "postgres" in docker-compose.yml | 12 | # Default to Postgres service name "postgres" in docker-compose.yml |
12 | PEERTUBE_DB_HOSTNAME=postgres | 13 | PEERTUBE_DB_HOSTNAME=postgres |
13 | 14 | ||
diff --git a/support/docker/production/Dockerfile.buster b/support/docker/production/Dockerfile.buster index b3822964d..2ff0591f9 100644 --- a/support/docker/production/Dockerfile.buster +++ b/support/docker/production/Dockerfile.buster | |||
@@ -7,7 +7,7 @@ ARG NPM_RUN_BUILD_OPTS | |||
7 | 7 | ||
8 | # Install dependencies | 8 | # Install dependencies |
9 | RUN apt update \ | 9 | RUN apt update \ |
10 | && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential \ | 10 | && apt install -y --no-install-recommends openssl ffmpeg python ca-certificates gnupg gosu build-essential curl \ |
11 | && gosu nobody true \ | 11 | && gosu nobody true \ |
12 | && rm /var/lib/apt/lists/* -fR | 12 | && rm /var/lib/apt/lists/* -fR |
13 | 13 | ||
diff --git a/support/docker/production/config/custom-environment-variables.yaml b/support/docker/production/config/custom-environment-variables.yaml index 8226715e0..0ed060bbf 100644 --- a/support/docker/production/config/custom-environment-variables.yaml +++ b/support/docker/production/config/custom-environment-variables.yaml | |||
@@ -19,6 +19,9 @@ database: | |||
19 | suffix: "PEERTUBE_DB_SUFFIX" | 19 | suffix: "PEERTUBE_DB_SUFFIX" |
20 | username: "PEERTUBE_DB_USERNAME" | 20 | username: "PEERTUBE_DB_USERNAME" |
21 | password: "PEERTUBE_DB_PASSWORD" | 21 | password: "PEERTUBE_DB_PASSWORD" |
22 | ssl: | ||
23 | __name: "PEERTUBE_DB_SSL" | ||
24 | __format: "json" | ||
22 | 25 | ||
23 | redis: | 26 | redis: |
24 | hostname: "PEERTUBE_REDIS_HOSTNAME" | 27 | hostname: "PEERTUBE_REDIS_HOSTNAME" |
diff --git a/support/docker/production/config/production.yaml b/support/docker/production/config/production.yaml index c97c37987..5cb39e268 100644 --- a/support/docker/production/config/production.yaml +++ b/support/docker/production/config/production.yaml | |||
@@ -62,7 +62,7 @@ storage: | |||
62 | client_overrides: '../data/client-overrides/' | 62 | client_overrides: '../data/client-overrides/' |
63 | 63 | ||
64 | log: | 64 | log: |
65 | level: 'info' # debug/info/warning/error | 65 | level: 'info' # 'debug' | 'info' | 'warn' | 'error' |
66 | 66 | ||
67 | tracker: | 67 | tracker: |
68 | enabled: true | 68 | enabled: true |