❌ Removed nginx container
This commit is contained in:
@@ -12,14 +12,13 @@ services:
|
||||
- $COMICS_DIRECTORY:/comics
|
||||
- $USERDATA_DIRECTORY:/userdata
|
||||
ports:
|
||||
# - "8050:8050"
|
||||
- "8050:8050"
|
||||
- "3050:3050"
|
||||
links:
|
||||
- importapi
|
||||
depends_on:
|
||||
- db
|
||||
# - elasticsearch
|
||||
- cors
|
||||
- elasticsearch
|
||||
- libraryqueue
|
||||
- redis
|
||||
- settings
|
||||
@@ -170,28 +169,21 @@ services:
|
||||
ports:
|
||||
- "6379:6379"
|
||||
|
||||
cors:
|
||||
image: shakyshane/nginx-cors
|
||||
ports:
|
||||
- 8050:80
|
||||
elasticsearch:
|
||||
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
|
||||
container_name: elasticsearch
|
||||
environment:
|
||||
- TARGET_DOMAIN=0.0.0.0
|
||||
|
||||
# elasticsearch:
|
||||
# image: docker.elastic.co/elasticsearch/elasticsearch:7.10.0
|
||||
# container_name: elasticsearch
|
||||
# environment:
|
||||
# - "discovery.type=single-node"
|
||||
# - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||
# - "xpack.security.enabled=true"
|
||||
# - "xpack.security.authc.api_key.enabled=true"
|
||||
# - "ELASTIC_PASSWORD=password"
|
||||
# ulimits:
|
||||
# memlock:
|
||||
# soft: -1
|
||||
# hard: -1
|
||||
# ports:
|
||||
# - 9200:9200
|
||||
- "discovery.type=single-node"
|
||||
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
|
||||
- "xpack.security.enabled=true"
|
||||
- "xpack.security.authc.api_key.enabled=true"
|
||||
- "ELASTIC_PASSWORD=password"
|
||||
ulimits:
|
||||
memlock:
|
||||
soft: -1
|
||||
hard: -1
|
||||
ports:
|
||||
- 9200:9200
|
||||
|
||||
networks:
|
||||
proxy:
|
||||
|
||||
32
proxy.conf
32
proxy.conf
@@ -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/;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user