Skip to content

Commit 7cfb761

Browse files
committed
build(docker): update docker-compose file, add nginx conf
1 parent 13b876c commit 7cfb761

File tree

2 files changed

+46
-38
lines changed

2 files changed

+46
-38
lines changed

data/nginx-vue/conf.d/default.conf

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
server {
2+
listen 80;
3+
server_name localhost;
4+
5+
#access_log /var/log/nginx/host.access.log main;
6+
7+
location / {
8+
root /usr/share/nginx/html;
9+
index index.html index.htm;
10+
}
11+
12+
#error_page 404 /404.html;
13+
14+
# redirect server error pages to the static page /50x.html
15+
#
16+
error_page 500 502 503 504 /50x.html;
17+
error_page 404 =200 /index.html;
18+
location = /50x.html {
19+
root /usr/share/nginx/html;
20+
}
21+
22+
# proxy the PHP scripts to Apache listening on 127.0.0.1:80
23+
#
24+
#location ~ \.php$ {
25+
# proxy_pass http://127.0.0.1;
26+
#}
27+
28+
# pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
29+
#
30+
#location ~ \.php$ {
31+
# root html;
32+
# fastcgi_pass 127.0.0.1:9000;
33+
# fastcgi_index index.php;
34+
# fastcgi_param SCRIPT_FILENAME /scripts$fastcgi_script_name;
35+
# include fastcgi_params;
36+
#}
37+
38+
# deny access to .htaccess files, if Apache's document root
39+
# concurs with nginx's one
40+
#
41+
#location ~ /\.ht {
42+
# deny all;
43+
#}
44+
}

docker-compose.yml

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,7 @@ services:
44
build: .
55
ports:
66
- "80:80"
7-
links:
8-
- epochtalk
9-
environment:
10-
BASE_URL: "http://localhost:8080"
11-
epochtalk:
12-
image: quay.io/epochtalk/epochtalk:ui-refactor-2020
13-
ports:
14-
- "8080:8080"
15-
- "23958:23958"
16-
depends_on:
17-
- redis
18-
- postgres
19-
- epoch
20-
links:
21-
- redis
22-
- postgres
237
env_file:
24-
- epochtalk-docker.env
25-
epoch:
26-
image: quay.io/epochtalk/epoch:v1.14.0
27-
depends_on:
28-
- postgres
29-
links:
30-
- postgres
31-
environment:
32-
MIX_ENV: prod
33-
DATABASE_USER: docker
34-
DATABASE_PASSWORD: docker
35-
DATABASE_NAME: epochtalk
36-
DATABASE_HOST: postgres
37-
redis:
38-
image: redis:4.0.1
39-
user: redis
40-
postgres:
41-
image: postgres:11.1
42-
environment:
43-
POSTGRES_USER: docker
44-
POSTGRES_PASSWORD: docker
8+
- epochtalk-vue.env
459
volumes:
46-
- ./db:/var/lib/postgresql/data
10+
- ./data/nginx-vue/conf.d:/etc/nginx/conf.d

0 commit comments

Comments
 (0)