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

add docker-compose for ci (#11795)

Browse Source 
* add docker-compose for ci

* docker-compose logs does not have the option to set the dc file

* leverage docker-compose extends

This moves the developer `docker-compose.yml` to the root, extending the `build/docker-compose.yml` and overriding the `container_name` to preserve compatibility with the older, non-docker-compose setup.

Note that this required downgrading to docker-compose 2.4's file format (still supported by the newer tooling) due to the long and frustrating converstaion at https://github.com/moby/moby/issues/31101.

* remove -f docker-compose-ci.yml references
This commit is contained in:
Carlos Tadeu Panato Junior
2019-08-06 08:46:53 +02:00
committed by GitHub
parent a1a190e5c0
commit c927fb9d50
4 changed files with 64 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -116,8 +116,8 @@ start-docker: ## Starts the docker containers for local development.
ifeq ($(IS_CI),false)
@echo Starting docker containers
docker-compose --no-ansi -f ./build/docker-compose.yml run --rm start_dependencies
cat tests/${LDAP_DATA}-data.ldif | docker-compose --no-ansi -f ./build/docker-compose.yml exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest || true';
docker-compose --no-ansi run --rm start_dependencies
cat tests/${LDAP_DATA}-data.ldif | docker-compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest || true';
else
@echo CI Build: skipping docker start
@@ -126,14 +126,14 @@ endif
stop-docker: ## Stops the docker containers for local development.
@echo Stopping docker containers
docker-compose --no-ansi -f ./build/docker-compose.yml stop
docker-compose --no-ansi stop
clean-docker: ## Deletes the docker containers for local development.
@echo Removing docker containers
docker-compose --no-ansi -f ./build/docker-compose.yml down -v
docker-compose --no-ansi -f ./build/docker-compose.yml rm -v
docker-compose --no-ansi down -v
docker-compose --no-ansi rm -v
govet: ## Runs govet against all packages.