[mod] docker-compose.yaml: remove hardcoded IP

This commit is contained in:
Dalf 2020-04-10 10:45:58 +02:00
parent 205adf88c4
commit 92cdb70360
2 changed files with 14 additions and 24 deletions

View file

@ -62,7 +62,7 @@
to /searx-checker/status.json to /searx-checker/status.json
} }
proxy / 127.0.0.1:4040 { proxy / localhost:4040 {
transparent transparent
header_upstream X-Forwarded-TlsProto {tls_protocol} header_upstream X-Forwarded-TlsProto {tls_protocol}
header_upstream X-Forwarded-TlsCipher {tls_cipher} header_upstream X-Forwarded-TlsCipher {tls_cipher}
@ -72,11 +72,11 @@
} }
basicauth /filtron {$FILTRON_USER} {$FILTRON_PASSWORD} basicauth /filtron {$FILTRON_USER} {$FILTRON_PASSWORD}
proxy /filtron/rules 127.0.0.1:4041 { proxy /filtron/rules localhost:4041 {
without /filtron without /filtron
} }
proxy /morty 127.0.0.1:3000 proxy /morty localhost:3000
limits 10KB limits 10KB

View file

@ -30,15 +30,13 @@ services:
filtron: filtron:
container_name: filtron container_name: filtron
image: dalf/filtron image: dalf/filtron
hostname: filtron
restart: always restart: always
ports: ports:
- 127.0.0.1:4040:4040 - 4040:4040
- 127.0.0.1:4041:4041 - 4041:4041
networks: networks:
searx: - searx
ipv4_address: 10.10.10.3 command: -listen 0.0.0.0:4040 -api 0.0.0.0:4041 -target searx:8080
command: -listen 10.10.10.3:4040 -api 10.10.10.3:4041 -target 10.10.10.4:8080
volumes: volumes:
- ./rules.json:/etc/filtron/rules.json:rw - ./rules.json:/etc/filtron/rules.json:rw
read_only: true read_only: true
@ -48,16 +46,14 @@ services:
searx: searx:
container_name: searx container_name: searx
image: searx/searx:latest image: searx/searx:latest
hostname: searx
restart: always restart: always
networks: networks:
searx: - searx
ipv4_address: 10.10.10.4
command: ${SEARX_COMMAND:-} command: ${SEARX_COMMAND:-}
volumes: volumes:
- ./searx:/etc/searx:rw - ./searx:/etc/searx:rw
environment: environment:
- BIND_ADDRESS=10.10.10.4:8080 - BIND_ADDRESS=0.0.0.0:8080
- BASE_URL=https://${SEARX_HOSTNAME}/ - BASE_URL=https://${SEARX_HOSTNAME}/
- MORTY_URL=https://${SEARX_HOSTNAME}/morty/ - MORTY_URL=https://${SEARX_HOSTNAME}/morty/
- MORTY_KEY=${MORTY_KEY} - MORTY_KEY=${MORTY_KEY}
@ -72,14 +68,12 @@ services:
morty: morty:
container_name: morty container_name: morty
image: dalf/morty image: dalf/morty
hostname: morty
restart: always restart: always
ports: ports:
- 127.0.0.1:3000:3000 - 3000:3000
networks: networks:
searx: - searx
ipv4_address: 10.10.10.5 command: -listen 0.0.0.0:3000 -timeout 6 -ipv6
command: -listen 10.10.10.5:3000 -timeout 6 -ipv6
environment: environment:
- MORTY_KEY=${MORTY_KEY} - MORTY_KEY=${MORTY_KEY}
logging: logging:
@ -91,12 +85,10 @@ services:
searx-checker: searx-checker:
container_name: searx-checker container_name: searx-checker
image: searx/searx-checker image: searx/searx-checker
hostname: searx-checker
restart: always restart: always
networks: networks:
searx: - searx
ipv4_address: 10.10.10.6 command: -cron -o html/data/status.json http://searx:8080
command: -cron -o html/data/status.json http://10.10.10.4:8080
volumes: volumes:
- searx-checker:/usr/local/searx-checker/html/data:rw - searx-checker:/usr/local/searx-checker/html/data:rw
@ -104,8 +96,6 @@ networks:
searx: searx:
ipam: ipam:
driver: default driver: default
config:
- subnet: 10.10.10.0/24
volumes: volumes:
searx-checker: searx-checker: