diff options
| author | Kana <[email protected]> | 2021-01-12 10:23:37 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-12 10:23:37 +0900 |
| commit | 38021d959988d9c0eb20f5e636ba189e8d91443a (patch) | |
| tree | c1ec13a88649ed8d7a85905bcc0c11863bddca4e /docker | |
| parent | Merge pull request #251 from Zephyrrus/fix/paginate_search (diff) | |
| parent | fix: docker setup (diff) | |
| download | host.fuwn.me-38021d959988d9c0eb20f5e636ba189e8d91443a.tar.xz host.fuwn.me-38021d959988d9c0eb20f5e636ba189e8d91443a.zip | |
Merge pull request #252 from WeebDev/fix/docker
fix: docker setup
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/chibi.sh | 2 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 3 | ||||
| -rw-r--r-- | docker/nginx/chibisafe.moe.http.example.conf | 2 | ||||
| -rw-r--r-- | docker/nginx/chibisafe.moe.https.example.conf | 2 |
4 files changed, 3 insertions, 6 deletions
diff --git a/docker/chibi.sh b/docker/chibi.sh index 9c8b22b..b6e2f44 100644 --- a/docker/chibi.sh +++ b/docker/chibi.sh @@ -1,2 +1,2 @@ -#!/bin/sh +#!/bin/bash docker-compose -f docker-compose.yml -f docker-compose.$1.yml -f docker-compose.config.yml ${@%$1} diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fc44689..b488670 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -24,9 +24,6 @@ services: expose: - "5000" - "5001" - ports: - - "5000" - - "5001" restart: unless-stopped environment: CHUNK_SIZE: 90 diff --git a/docker/nginx/chibisafe.moe.http.example.conf b/docker/nginx/chibisafe.moe.http.example.conf index 0a0d507..efc1e3a 100644 --- a/docker/nginx/chibisafe.moe.http.example.conf +++ b/docker/nginx/chibisafe.moe.http.example.conf @@ -12,7 +12,7 @@ server { # reverse proxy location / { - proxy_pass http://localhost:5000; + proxy_pass http://chibisafe:5000; include nginxconfig.io/proxy.conf; } diff --git a/docker/nginx/chibisafe.moe.https.example.conf b/docker/nginx/chibisafe.moe.https.example.conf index fce9e9a..c8b83c2 100644 --- a/docker/nginx/chibisafe.moe.https.example.conf +++ b/docker/nginx/chibisafe.moe.https.example.conf @@ -16,7 +16,7 @@ server { # reverse proxy location / { - proxy_pass http://localhost:5000; + proxy_pass http://chibisafe:5000; include nginxconfig.io/proxy.conf; } |