Removed nginx container

This commit is contained in:
2021-11-26 01:13:21 -08:00
parent 0c01d11b44
commit 2cc9aee22e
2 changed files with 16 additions and 56 deletions

View File

@@ -12,14 +12,13 @@ services:
- $COMICS_DIRECTORY:/comics - $COMICS_DIRECTORY:/comics
- $USERDATA_DIRECTORY:/userdata - $USERDATA_DIRECTORY:/userdata
ports: ports:
# - "8050:8050" - "8050:8050"
- "3050:3050" - "3050:3050"
links: links:
- importapi - importapi
depends_on: depends_on:
- db - db
# - elasticsearch - elasticsearch
- cors
- libraryqueue - libraryqueue
- redis - redis
- settings - settings
@@ -170,28 +169,21 @@ services:
ports: ports:
- "6379:6379" - "6379:6379"
cors: elasticsearch:
image: shakyshane/nginx-cors image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
ports: container_name: elasticsearch
- 8050:80
environment: environment:
- TARGET_DOMAIN=0.0.0.0 - "discovery.type=single-node"
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
# elasticsearch: - "xpack.security.enabled=true"
# image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0 - "xpack.security.authc.api_key.enabled=true"
# container_name: elasticsearch - "ELASTIC_PASSWORD=password"
# environment: ulimits:
# - "discovery.type=single-node" memlock:
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m" soft: -1
# - "xpack.security.enabled=true" hard: -1
# - "xpack.security.authc.api_key.enabled=true" ports:
# - "ELASTIC_PASSWORD=password" - 9200:9200
# ulimits:
# memlock:
# soft: -1
# hard: -1
# ports:
# - 9200:9200
networks: networks:
proxy: proxy:

View File

@@ -1,32 +0,0 @@
upstream api {
# Could be host.docker.internal - Docker for Mac/Windows - the host itself
# Could be your API in a appropriate domain
# Could be other container in the same network, like container_name:port
server ghost:8050;
}
server {
listen 8050;
server_name ghost;
location / {
if ($request_method = 'OPTIONS') {
add_header 'Access-Control-Max-Age' 1728000;
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,
X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
add_header 'Access-Control-Allow-Methods' 'GET,POST,OPTIONS,PUT,DELETE,PATCH';
add_header 'Content-Type' 'application/json';
add_header 'Content-Length' 0;
return 204;
}
add_header 'Access-Control-Allow-Origin' '*';
add_header 'Access-Control-Allow-Headers' 'Authorization,Accept,Origin,DNT,X-CustomHeader,Keep-Alive,User-Agent,
X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range';
add_header 'Access-Control-Allow-Methods' 'GET,POST,OPTIONS,PUT,DELETE,PATCH';
proxy_pass http://api/;
}
}