diff --git a/docker/README.md b/docker/README.md index 68099b51..cb1954b8 100644 --- a/docker/README.md +++ b/docker/README.md @@ -38,8 +38,8 @@ You can check if it was successful with `docker-compose --version`. Download [docker-compose/default/docker-compose.yml](docker-compose/default/docker-compose.yml) and [docker-compose/default/nginx.conf](docker-compose/default/nginx.conf). -Edit `docker-compose.yml` to point the volumes to the right `image` and `tmp` directories. -Edit `nginx.conf` by replacing `yourdomain.com` to you domain address. +Edit `docker-compose.yml` at the `# CHANGE ME` lines to point the volumes to the right `image` and `tmp` directories. +Edit `nginx.conf` at the `# CHANGE ME` lines by replacing `yourdomain.com` to you domain address. **Note**: Do not change the `image` and the `tmp` path in the `config.json` or in the UI, only through the `volume` settings of the docker. See [here](https://github.com/bpatrik/pigallery2/issues/114#issuecomment-570006336) and [here](https://github.com/bpatrik/pigallery2/issues/119). diff --git a/docker/docker-compose/default/docker-compose.yml b/docker/docker-compose/default/docker-compose.yml index f5e92966..4f9cf145 100644 --- a/docker/docker-compose/default/docker-compose.yml +++ b/docker/docker-compose/default/docker-compose.yml @@ -19,10 +19,10 @@ services: environment: - NODE_ENV=production volumes: - - "./pigallery2/config:/app/data/config" + - "./pigallery2/config:/app/data/config" # CHANGE ME - "db-data:/app/data/db" - - "./pigallery2/images:/app/data/images" - - "./pigallery2/tmp:/app/data/tmp" + - "./pigallery2/images:/app/data/images" # CHANGE ME + - "./pigallery2/tmp:/app/data/tmp" # CHANGE ME expose: - "80" restart: always diff --git a/docker/docker-compose/default/nginx.conf b/docker/docker-compose/default/nginx.conf index 6dc96b7c..7b9581fc 100644 --- a/docker/docker-compose/default/nginx.conf +++ b/docker/docker-compose/default/nginx.conf @@ -46,12 +46,12 @@ http { listen 80 default_server; listen [::]:80 default_server; - server_name yourdomain.com www.yourdomain.com; + server_name yourdomain.com www.yourdomain.com; # CHANGE ME return 301 https://$server_name$request_uri; } server { - server_name yourdomain.com; + server_name yourdomain.com; # CHANGE ME gzip on; @@ -69,8 +69,8 @@ http { listen 443 ssl default_server; listen [::]:443 ssl default_server; - ssl_certificate /etc/letsencrypt/live/yourdomain.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/yourdomain.com/privkey.pem; + ssl_certificate /etc/letsencrypt/live/yourdomain.com/fullchain.pem; # CHANGE ME + ssl_certificate_key /etc/letsencrypt/live/yourdomain.com/privkey.pem; # CHANGE ME include /etc/letsencrypt/options-ssl-nginx.conf; } } diff --git a/docker/docker-compose/pigallery2-only/docker-compose.yml b/docker/docker-compose/pigallery2-only/docker-compose.yml index b5e9916d..9799e40f 100644 --- a/docker/docker-compose/pigallery2-only/docker-compose.yml +++ b/docker/docker-compose/pigallery2-only/docker-compose.yml @@ -6,10 +6,10 @@ services: environment: - NODE_ENV=production volumes: - - "./pigallery2/config:/app/data/config" + - "./pigallery2/config:/app/data/config" # CHANGE ME - "db-data:/app/data/db" - - "./pigallery2/images:/app/data/images" - - "./pigallery2/tmp:/app/data/tmp" + - "./pigallery2/images:/app/data/images" # CHANGE ME + - "./pigallery2/tmp:/app/data/tmp" # CHANGE ME ports: - 80:80 restart: always diff --git a/docker/docker-compose/with-mysql/docker-compose.yml b/docker/docker-compose/with-mysql/docker-compose.yml index 58c6da96..dc876d89 100644 --- a/docker/docker-compose/with-mysql/docker-compose.yml +++ b/docker/docker-compose/with-mysql/docker-compose.yml @@ -31,10 +31,10 @@ services: environment: - NODE_ENV=production volumes: - - ./pigallery2/config:/app/data/config - - db-data:/app/data/db - - ./pigallery2/images:/app/data/images - - ./pigallery2/tmp:/app/data/tmp + - "./pigallery2/config:/app/data/config" # CHANGE ME + - "db-data:/app/data/db" + - "./pigallery2/images:/app/data/images" # CHANGE ME + - "./pigallery2/tmp:/app/data/tmp" # CHANGE ME expose: - "80" restart: always diff --git a/docker/docker-compose/with-mysql/nginx.conf b/docker/docker-compose/with-mysql/nginx.conf index 6dc96b7c..ef4ea867 100644 --- a/docker/docker-compose/with-mysql/nginx.conf +++ b/docker/docker-compose/with-mysql/nginx.conf @@ -46,12 +46,12 @@ http { listen 80 default_server; listen [::]:80 default_server; - server_name yourdomain.com www.yourdomain.com; + server_name yourdomain.com www.yourdomain.com; # CHANGE ME return 301 https://$server_name$request_uri; } server { - server_name yourdomain.com; + server_name yourdomain.com; # CHANGE ME gzip on; @@ -69,8 +69,8 @@ http { listen 443 ssl default_server; listen [::]:443 ssl default_server; - ssl_certificate /etc/letsencrypt/live/yourdomain.com/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/yourdomain.com/privkey.pem; + ssl_certificate /etc/letsencrypt/live/yourdomain.com/fullchain.pem; # CHANGE ME + ssl_certificate_key /etc/letsencrypt/live/yourdomain.com/privkey.pem; # CHANGE ME include /etc/letsencrypt/options-ssl-nginx.conf; } }