diff options
| author | Pitu <[email protected]> | 2021-02-21 23:38:54 +0900 |
|---|---|---|
| committer | Pitu <[email protected]> | 2021-02-21 23:38:54 +0900 |
| commit | 6199cc0cb676bae787e4106d5322d235a1138a4a (patch) | |
| tree | b30b5efd9993459a302cfba363bda771617df404 /docker | |
| parent | fix: disabled users on migration (diff) | |
| parent | Update docker.md (diff) | |
| download | host.fuwn.me-6199cc0cb676bae787e4106d5322d235a1138a4a.tar.xz host.fuwn.me-6199cc0cb676bae787e4106d5322d235a1138a4a.zip | |
Merge branch 'master' of github.com:WeebDev/lolisafe
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/docker-compose.local.yml | 4 | ||||
| -rw-r--r-- | docker/docker-compose.prod.yml | 4 | ||||
| -rw-r--r-- | docker/nginx/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/nginx/ssl/.gitkeep | 0 |
4 files changed, 1 insertions, 8 deletions
diff --git a/docker/docker-compose.local.yml b/docker/docker-compose.local.yml index 982370a..8b41939 100644 --- a/docker/docker-compose.local.yml +++ b/docker/docker-compose.local.yml @@ -1,10 +1,6 @@ version: "3.7" services: - nginx: - volumes: - - nginx-data:/etc/nginx - chibisafe: volumes: - chibisafe-data:/usr/chibisafe/uploads diff --git a/docker/docker-compose.prod.yml b/docker/docker-compose.prod.yml index 9683a98..cd766d7 100644 --- a/docker/docker-compose.prod.yml +++ b/docker/docker-compose.prod.yml @@ -1,10 +1,6 @@ version: "3.7" services: - nginx: - volumes: - - ./nginx-data:/etc/nginx - chibisafe: volumes: - ./chibisafe-data:/usr/chibisafe/uploads diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 60626ba..2731007 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -3,3 +3,4 @@ FROM nginx COPY nginxconfig.io /etc/nginx/nginxconfig.io COPY nginx.conf /etc/nginx/nginx.conf COPY chibisafe.moe.conf /etc/nginx/conf.d/chibisafe.moe.conf +COPY ssl /etc/nginx/ssl diff --git a/docker/nginx/ssl/.gitkeep b/docker/nginx/ssl/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/docker/nginx/ssl/.gitkeep |