mirror of
https://github.com/ChristianLight/tutor.git
synced 2024-06-07 00:20:49 +00:00
Merge remote-tracking branch 'origin/master' into nightly
This commit is contained in:
commit
d247c288b1
|
@ -1,5 +1,14 @@
|
|||
# Global configuration
|
||||
{
|
||||
|
||||
{% if not ENABLE_WEB_PROXY %}
|
||||
# Enable proxying from all servers by default. Otherwise, X-Forwarded-* headers will
|
||||
# be overwritten.
|
||||
# https://caddyserver.com/docs/caddyfile/directives/reverse_proxy#defaults
|
||||
servers {
|
||||
trusted_proxies static 0.0.0.0/0 ::/0
|
||||
}
|
||||
{% endif %}
|
||||
{{ patch("caddyfile-global")|indent(4) }}
|
||||
}
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ DOCKER_COMPOSE_VERSION: "3.7"
|
|||
DOCKER_REGISTRY: "docker.io/"
|
||||
DOCKER_IMAGE_OPENEDX: "{{ DOCKER_REGISTRY }}overhangio/openedx:{{ TUTOR_VERSION }}"
|
||||
DOCKER_IMAGE_OPENEDX_DEV: "openedx-dev:{{ TUTOR_VERSION }}"
|
||||
DOCKER_IMAGE_CADDY: "docker.io/caddy:2.6.2"
|
||||
DOCKER_IMAGE_CADDY: "docker.io/caddy:2.6.3"
|
||||
DOCKER_IMAGE_ELASTICSEARCH: "docker.io/elasticsearch:7.10.1"
|
||||
DOCKER_IMAGE_MONGODB: "docker.io/mongo:4.2.17"
|
||||
DOCKER_IMAGE_MYSQL: "docker.io/mysql:5.7.35"
|
||||
|
|
Loading…
Reference in New Issue
Block a user