IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

load docker-compose.override.yaml when it exists (#19541)

Browse Source
This commit is contained in:
Julien Tant 2022-02-15 06:38:50 -07:00 committed by GitHub
parent 3291f00cc0
commit 431a5fce59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -121,3 +121,4 @@ __debug_bin
report.xml report.xml
go.*.orig go.*.orig
config.override.mk config.override.mk
docker-compose.override.yaml

11
Makefile
View File

@ -163,6 +163,11 @@ ifeq ($(RUN_SERVER_IN_BACKGROUND),true)
RUN_IN_BACKGROUND := & RUN_IN_BACKGROUND := &
endif endif
DOCKER_COMPOSE_OVERRIDE=
ifneq ("$(wildcard ./docker-compose.override.yaml)","")
DOCKER_COMPOSE_OVERRIDE=-f docker-compose.override.yaml
endif
start-docker-check: start-docker-check:
ifeq (,$(findstring minio,$(ENABLED_DOCKER_SERVICES))) ifeq (,$(findstring minio,$(ENABLED_DOCKER_SERVICES)))
TEMP_DOCKER_SERVICES:=$(TEMP_DOCKER_SERVICES) minio TEMP_DOCKER_SERVICES:=$(TEMP_DOCKER_SERVICES) minio
@ -185,9 +190,9 @@ else ifeq ($(MM_NO_DOCKER),true)
else else
@echo Starting docker containers @echo Starting docker containers
$(GO) run ./build/docker-compose-generator/main.go $(ENABLED_DOCKER_SERVICES) | docker-compose -f docker-compose.makefile.yml -f /dev/stdin run --rm start_dependencies $(GO) run ./build/docker-compose-generator/main.go $(ENABLED_DOCKER_SERVICES) | docker-compose -f docker-compose.makefile.yml -f /dev/stdin $(DOCKER_COMPOSE_OVERRIDE) run --rm start_dependencies
ifneq (,$(findstring openldap,$(ENABLED_DOCKER_SERVICES))) ifneq (,$(findstring openldap,$(ENABLED_DOCKER_SERVICES)))
cat tests/${LDAP_DATA}-data.ldif | docker-compose -f docker-compose.makefile.yml exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest || true'; cat tests/${LDAP_DATA}-data.ldif | docker-compose -f docker-compose.makefile.yml $(DOCKER_COMPOSE_OVERRIDE) exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest || true';
endif endif
ifneq (,$(findstring mysql-read-replica,$(ENABLED_DOCKER_SERVICES))) ifneq (,$(findstring mysql-read-replica,$(ENABLED_DOCKER_SERVICES)))
./scripts/replica-mysql-config.sh ./scripts/replica-mysql-config.sh
@ -198,7 +203,7 @@ run-haserver:
ifeq ($(BUILD_ENTERPRISE_READY),true) ifeq ($(BUILD_ENTERPRISE_READY),true)
@echo Starting mattermost in an HA topology '(3 node cluster)' @echo Starting mattermost in an HA topology '(3 node cluster)'
docker-compose -f docker-compose.yaml up --remove-orphans haproxy docker-compose -f docker-compose.yaml $(DOCKER_COMPOSE_OVERRIDE) up --remove-orphans haproxy
endif endif
stop-haserver: stop-haserver: