Преглед изворни кода

Allow custom redis and psql servers to be set through .env

master
jfederico пре 4 година
родитељ
комит
0ecf2ccf99
2 измењених фајлова са 6 додато и 6 уклоњено
  1. 4
    6
      docker-compose.yml
  2. 2
    0
      dotenv

+ 4
- 6
docker-compose.yml Прегледај датотеку

14
       - ./nginx/sites.template:/etc/nginx/sites-available/sites.template
14
       - ./nginx/sites.template:/etc/nginx/sites-available/sites.template
15
       - ./nginx/default/html:/var/www/html
15
       - ./nginx/default/html:/var/www/html
16
       - ./nginx/log/nginx:/var/log/nginx
16
       - ./nginx/log/nginx:/var/log/nginx
17
-## Configuration for Letsencrypt SSL Certificate
18
       - ./data/certbot/conf:/etc/letsencrypt
17
       - ./data/certbot/conf:/etc/letsencrypt
19
       - ./data/certbot/www:/var/www/certbot
18
       - ./data/certbot/www:/var/www/certbot
20
-## Configuration for Letsencrypt SSL Certificate
21
-#      - ./nginx/ssl/:/etc/ssl
19
+      - ./nginx/ssl/:/etc/ssl
22
     ports:
20
     ports:
23
       - "80:80"
21
       - "80:80"
24
       - "443:443"
22
       - "443:443"
79
       - ./scalelite/tmp/cache/assets:/usr/src/app/tmp/cache/assets
77
       - ./scalelite/tmp/cache/assets:/usr/src/app/tmp/cache/assets
80
     env_file: ./scalelite/.env
78
     env_file: ./scalelite/.env
81
     environment:
79
     environment:
82
-      - REDIS_URL=redis://redis:6379
83
-      - DATABASE_URL=postgres://postgres:password@postgres:5432/scalelite?pool=5
80
+      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
81
+      - DATABASE_URL=${DATABASE_URL:-postgres://postgres:password@postgres:5432/scalelite?pool=5}
84
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
82
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
85
 
83
 
86
 
84
 
97
       - ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller
95
       - ./scalelite/bin/start-poller:/srv/scalelite/bin/start-poller
98
     env_file: ./scalelite/.env
96
     env_file: ./scalelite/.env
99
     environment:
97
     environment:
100
-      - REDIS_URL=redis://redis:6379
98
+      - REDIS_URL=${REDIS_URL:-redis://redis:6379}
101
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}
99
       - URL_HOST=${HOST_NAME:-sl.xlab.blindside-dev.com}

+ 2
- 0
dotenv Прегледај датотеку

1
 HOST_NAME=sl.xlab.blindside-dev.com
1
 HOST_NAME=sl.xlab.blindside-dev.com
2
+REDIS_URL=redis://redis:6379
3
+DATABASE_URL=postgres://postgres:password@postgres:5432/scalelite?pool=5

Loading…
Откажи
Сачувај