* 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
Этот коммит содержится в:
Carlos Tadeu Panato Junior
2019-08-06 08:46:53 +02:00
коммит произвёл GitHub
родитель a1a190e5c0
Коммит c927fb9d50
4 изменённых файлов: 64 добавлений и 10 удалений

Просмотреть файл

@@ -131,12 +131,12 @@ pipeline {
}
steps {
dir('src/github.com/mattermost/mattermost-server') {
dir('src/github.com/mattermost/mattermost-server/build') {
ansiColor('xterm') {
sh """
/usr/local/bin/docker-compose --no-ansi -f ./build/docker-compose.yml run --rm start_dependencies
/usr/local/bin/docker-compose --no-ansi -f ./build/docker-compose.yml ps
cat tests/${LDAP_DATA}-data.ldif | /usr/local/bin/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';
/usr/local/bin/docker-compose --no-ansi run --rm start_dependencies
/usr/local/bin/docker-compose --no-ansi ps
cat ../tests/${LDAP_DATA}-data.ldif | /usr/local/bin/docker-compose --no-ansi exec -T openldap bash -c 'ldapadd -x -D "cn=admin,dc=mm,dc=test,dc=com" -w mostest';
"""
}
}

Просмотреть файл

@@ -1,4 +1,4 @@
version: '3.4'
version: '2.4'
services:
mysql:
image: "mysql:5.7"