From b1053a30f6979ad097965efd1fa661ed37209f78 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 11 Aug 2022 10:43:31 +0200
Subject: Add ability to use docker on local

---
 server/helpers/custom-validators/activitypub/misc.ts | 4 ++--
 support/docker/production/.env                       | 7 ++++---
 support/docker/production/docker-compose.yml         | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/helpers/custom-validators/activitypub/misc.ts b/server/helpers/custom-validators/activitypub/misc.ts
index ff15f115f..4619f0eb5 100644
--- a/server/helpers/custom-validators/activitypub/misc.ts
+++ b/server/helpers/custom-validators/activitypub/misc.ts
@@ -1,6 +1,6 @@
 import validator from 'validator'
+import { CONFIG } from '@server/initializers/config'
 import { CONSTRAINTS_FIELDS } from '../../../initializers/constants'
-import { isTestOrDevInstance } from '../../core-utils'
 import { exists } from '../misc'
 
 function isUrlValid (url: string) {
@@ -13,7 +13,7 @@ function isUrlValid (url: string) {
   }
 
   // We validate 'localhost', so we don't have the top level domain
-  if (isTestOrDevInstance()) {
+  if (CONFIG.WEBSERVER.HOSTNAME === 'localhost') {
     isURLOptions.require_tld = false
   }
 
diff --git a/support/docker/production/.env b/support/docker/production/.env
index 70743e0ec..4e7b21ab6 100644
--- a/support/docker/production/.env
+++ b/support/docker/production/.env
@@ -12,10 +12,11 @@ PEERTUBE_DB_SSL=false
 # Default to Postgres service name "postgres" in docker-compose.yml
 PEERTUBE_DB_HOSTNAME=postgres
 
-# Server configuration
+# PeerTube server configuration
+# If you test PeerTube in local: use "peertube.localhost" and add this domain to your host file resolving on 127.0.0.1
 PEERTUBE_WEBSERVER_HOSTNAME=<MY DOMAIN>
-# If you do not use https and a reverse-proxy in docker-compose.yml
-#PEERTUBE_WEBSERVER_PORT=80
+# If you just want to test PeerTube on local
+#PEERTUBE_WEBSERVER_PORT=9000
 #PEERTUBE_WEBSERVER_HTTPS=false
 # If you need more than one IP as trust_proxy
 # pass them as a comma separated array:
diff --git a/support/docker/production/docker-compose.yml b/support/docker/production/docker-compose.yml
index cf90b226f..13f75f222 100644
--- a/support/docker/production/docker-compose.yml
+++ b/support/docker/production/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3.3"
 
 services:
 
-  # You can comment this webserver section if you want to use another webserver/proxy
+  # You can comment this webserver section if you want to use another webserver/proxy or test PeerTube in local
   webserver:
     image: chocobozzz/peertube-webserver:latest
     # If you don't want to use the official image and build one from sources:
@@ -28,7 +28,7 @@ services:
       - peertube
     restart: "always"
 
-  # You can comment this certbot section if you want to use another webserver/proxy
+  # You can comment this certbot section if you want to use another webserver/proxy or test PeerTube in local
   certbot:
     container_name: certbot
     image: certbot/certbot
@@ -55,8 +55,8 @@ services:
       - .env
 
     ports:
-     - "1935:1935" # If you don't want to use the live feature, you can comment this line
-    #  - "9000:9000" # If you provide your own webserver and reverse-proxy, otherwise not suitable for production
+     - "1935:1935" # Comment if you don't want to use the live feature
+    #  - "9000:9000" # Uncomment if you use another webserver/proxy or test PeerTube in local, otherwise not suitable for production
     volumes:
       - assets:/app/client/dist
       - ./docker-volume/data:/data
-- 
cgit v1.2.3