Skip to content

Commit c4c96d0

Browse files
authored
Merge pull request #32 from kc3hack/29-nginx-config
local.akane.yaken.org の設定
2 parents c1ff307 + c9a1b38 commit c4c96d0

File tree

6 files changed

+22
-20
lines changed

6 files changed

+22
-20
lines changed

Diff for: compose.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ services:
1515
- node_modules
1616
- action: rebuild
1717
path: package.json
18+
nginx:
19+
image: nginx:latest
20+
build:
21+
context: docker/nginx
22+
dockerfile: ./Dockerfile
23+
ports:
24+
- "80:80"

Diff for: docker/nginx/Dockerfile

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
FROM nginx:latest
2+
3+
RUN rm -f /etc/nginx/conf.d/*
4+
COPY conf.d/ /etc/nginx/conf.d/
5+
COPY nginx.conf /etc/nginx/nginx.conf

Diff for: docker/nginx/conf.d/local.akane.yaken.org.conf

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
server {
2+
listen 80;
3+
server_name local.akane.yaken.org;
4+
5+
location / {
6+
proxy_pass http://akane-next:3000/;
7+
}
8+
}

Diff for: nginx/nginx.conf renamed to docker/nginx/nginx.conf

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
21
user nginx;
32
worker_processes auto;
43

54
error_log /var/log/nginx/error.log notice;
65
pid /var/run/nginx.pid;
76

8-
97
events {
108
worker_connections 2048;
119
multi_accept on;
@@ -29,7 +27,8 @@ http {
2927

3028
keepalive_timeout 65;
3129

30+
# コメントアウトしているが、問題がなければ有効にしてもいいだろう
3231
#gzip on;
3332

3433
include /etc/nginx/conf.d/*.conf;
35-
}
34+
}

Diff for: nginx/Dockerfile

-5
This file was deleted.

Diff for: nginx/conf.d/akane.yaken.org.conf

-12
This file was deleted.

0 commit comments

Comments
 (0)