jiriks74/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update travis tests (#243)

Browse Source 
* Remove docker .env file

* Add enviroment variables defaults

* Update docker-compose version

* Update travis tests variables

* Build document server image

* Fix mariadb

* Fix variable names

* Revert container name

(cherry picked from commit e721ca102d0b75b0f01099c2b9c10d73db140250)
This commit is contained in:
Semyon Bezrukov 2020-04-28 15:05:35 +03:00 committed by agolybev
parent 9d82bb8d1f
commit ab5637a11f
11 changed files with 74 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.travis.yml
View File

@ -16,43 +16,24 @@ env:
# deprecated variables # deprecated variables
- config: postgres-old.yml - config: postgres-old.yml
POSTGRESQL_SERVER_HOST: onlyoffice-postgresql
POSTGRESQL_SERVER_PORT: 5432
POSTGRESQL_SERVER_DB_NAME: onlyoffice
POSTGRESQL_SERVER_USER: onlyoffice
POSTGRESQL_SERVER_PASS: onlyoffice
# mysql # mysql
- config: mysql.yml - config: mysql.yml
DB_TYPE: mysql
DB_HOST: onlyoffice-mysql
DB_PORT: 3306
# mariadb # mariadb
- config: mariadb.yml - config: mariadb.yml
DB_TYPE: mysql
DB_HOST: db
DB_PORT: 3306
# activemq # activemq
- config: activemq.yml - config: activemq.yml
AMQP_TYPE: activemq
AMQP_URI: amqp://guest:guest@onlyoffice-activemq
# rabbitmq # rabbitmq
- config: rabbitmq.yml - config: rabbitmq.yml
AMQP_TYPE: rabbitmq
AMQP_URI: amqp://guest:guest@onlyoffice-rabbitmq
# rabbitmq old variables # rabbitmq old variables
- config: rabbitmq-old.yml - config: rabbitmq-old.yml
AMQP_SERVER_TYPE: rabbitmq
AMQP_SERVER_URL: amqp://guest:guest@onlyoffice-rabbitmq
# redis # redis
- config: redis.yml - config: redis.yml
REDIS_SERVER_HOST: onlyoffice-redis
REDIS_SERVER_PORT: 6379
services: services:
- docker - docker

13
tests/activemq.yml
View File

@ -1,11 +1,12 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
environment: environment:
- AMQP_TYPE - AMQP_TYPE=${AMQP_TYPE:-activemq}
- AMQP_URI - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-activemq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -18,8 +19,8 @@ services:
container_name: onlyoffice-activemq container_name: onlyoffice-activemq
image: webcenter/activemq:5.14.3 image: webcenter/activemq:5.14.3
environment: environment:
- ACTIVEMQ_USERS_guest - ACTIVEMQ_USERS_guest=${ACTIVEMQ_USERS_guest:-guest}
- ACTIVEMQ_GROUPS_owners - ACTIVEMQ_GROUPS_owners=${ACTIVEMQ_GROUPS_owners:-guest}
restart: always restart: always
networks: networks:
- onlyoffice - onlyoffice

41
tests/defaults.env
View File

@ -1,41 +0,0 @@
# DocumentServer Container
ONLYOFFICE_DATA_CONTAINER=true
DB_TYPE=postgres
DB_HOST=onlyoffice-postgresql
DB_PORT=5432
DB_NAME=onlyoffice
DB_USER=onlyoffice
DB_PWD=onlyoffice
AMQP_TYPE=rabbitmq
AMQP_URI=amqp://guest:guest@onlyoffice-rabbitmq
REDIS_SERVER_HOST=onlyoffice-redis
REDIS_SERVER_PORT=6379
JWT_ENABLED=true
JWT_SECRET=secret
JWT_HEADER=Authorization
ONLYOFFICE_DATA_CONTAINER_HOST=onlyoffice-documentserver-data
BALANCE=uri depth 3
EXCLUDE_PORTS=443
HTTP_CHECK=GET /healthcheck
EXTRA_SETTINGS=http-check expect string true
FORCE_SSL=true
# HAProxy Container
MODE=http
CERT_FOLDER=/certs/
# ActiveMQ Container
ACTIVEMQ_USERS_guest=guest
ACTIVEMQ_GROUPS_owners=guest
# Postgres Container
POSTGRES_DB=onlyoffice
POSTGRES_USER=onlyoffice
POSTGRES_HOST_AUTH_METHOD=trust
# MySQL Container
MYSQL_DATABASE=onlyoffice
MYSQL_USER=onlyoffice
MYSQL_PASSWORD=onlyoffice
MYSQL_ALLOW_EMPTY_PASSWORD=yes

31
tests/mariadb.yml
View File

@ -1,30 +1,31 @@
version: '2' version: '2.1'
services: services:
ds: ds:
container_name: ds container_name: ds
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
depends_on: depends_on:
- db - onlyoffice-mariadb
environment: environment:
- DB_TYPE - DB_TYPE=${DB_TYPE:-mysql}
- DB_HOST - DB_HOST=${DB_HOST:-onlyoffice-mariadb}
- DB_PORT - DB_PORT=${DB_PORT:-3306}
- DB_NAME - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
- '80:80' - '80:80'
db: onlyoffice-mariadb:
container_name: db container_name: onlyoffice-mariadb
image: mariadb:10.5 image: mariadb:10.5
environment: environment:
- MYSQL_DATABASE - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
- MYSQL_USER - MYSQL_USER=${MYSQL_USER:-onlyoffice}
- MYSQL_PASSWORD - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
- MYSQL_ALLOW_EMPTY_PASSWORD - MYSQL_ALLOW_EMPTY_PASSWORD=${MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
restart: always restart: always
volumes: volumes:
- mysql_data:/var/lib/mysql - mysql_data:/var/lib/mysql

25
tests/mysql.yml
View File

@ -1,17 +1,18 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
depends_on: depends_on:
- onlyoffice-mysql - onlyoffice-mysql
environment: environment:
- DB_TYPE - DB_TYPE=${DB_TYPE:-mysql}
- DB_HOST - DB_HOST=${DB_HOST:-onlyoffice-mysql}
- DB_PORT - DB_PORT=${DB_PORT:-3306}
- DB_NAME - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -21,10 +22,10 @@ services:
container_name: onlyoffice-mysql container_name: onlyoffice-mysql
image: mysql:5.7 image: mysql:5.7
environment: environment:
- MYSQL_DATABASE - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
- MYSQL_USER - MYSQL_USER=${MYSQL_USER:-onlyoffice}
- MYSQL_PASSWORD - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
- MYSQL_ALLOW_EMPTY_PASSWORD - MYSQL_ALLOW_EMPTY_PASSWORD=${MYSQL_ALLOW_EMPTY_PASSWORD:-yes}
restart: always restart: always
volumes: volumes:
- mysql_data:/var/lib/mysql - mysql_data:/var/lib/mysql

21
tests/postgres-old.yml
View File

@ -1,16 +1,17 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
depends_on: depends_on:
- onlyoffice-postgresql - onlyoffice-postgresql
environment: environment:
- POSTGRESQL_SERVER_HOST - POSTGRESQL_SERVER_HOST=${DB_HOST:-onlyoffice-postgresql}
- POSTGRESQL_SERVER_PORT - POSTGRESQL_SERVER_PORT=${DB_PORT:-5432}
- POSTGRESQL_SERVER_DB_NAME - POSTGRESQL_SERVER_DB_NAME=${DB_NAME:-onlyoffice}
- POSTGRESQL_SERVER_USER - POSTGRESQL_SERVER_USER=${DB_USER:-onlyoffice}
- POSTGRESQL_SERVER_PASS - POSTGRESQL_SERVER_PASS=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -20,9 +21,9 @@ services:
container_name: onlyoffice-postgresql container_name: onlyoffice-postgresql
image: postgres:9.5 image: postgres:9.5
environment: environment:
- POSTGRES_DB - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
- POSTGRES_USER - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
- POSTGRES_HOST_AUTH_METHOD - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
restart: always restart: always
expose: expose:
- '5432' - '5432'

23
tests/postgres.yml
View File

@ -1,17 +1,18 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
depends_on: depends_on:
- onlyoffice-postgresql - onlyoffice-postgresql
environment: environment:
- DB_TYPE - DB_TYPE=${DB_TYPE:-postgres}
- DB_HOST - DB_HOST=${DB_HOST:-onlyoffice-postgresql}
- DB_PORT - DB_PORT=${DB_PORT:-5432}
- DB_NAME - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -21,9 +22,9 @@ services:
container_name: onlyoffice-postgresql container_name: onlyoffice-postgresql
image: postgres:9.5 image: postgres:9.5
environment: environment:
- POSTGRES_DB - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
- POSTGRES_USER - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
- POSTGRES_HOST_AUTH_METHOD - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
restart: always restart: always
expose: expose:
- '5432' - '5432'

9
tests/rabbitmq-old.yml
View File

@ -1,11 +1,12 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
environment: environment:
- AMQP_SERVER_TYPE - AMQP_SERVER_TYPE=${AMQP_SERVER_TYPE:-rabbitmq}
- AMQP_SERVER_URL - AMQP_SERVER_URL=${AMQP_SERVER_URL:-amqp://guest:guest@onlyoffice-rabbitmq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:

9
tests/rabbitmq.yml
View File

@ -1,11 +1,12 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
environment: environment:
- AMQP_TYPE - AMQP_TYPE=${AMQP_TYPE:-rabbitmq}
- AMQP_URI - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-rabbitmq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:

9
tests/redis.yml
View File

@ -1,11 +1,12 @@
version: '2' version: '2.1'
services: services:
onlyoffice-documentserver: onlyoffice-documentserver:
container_name: onlyoffice-documentserver container_name: onlyoffice-documentserver
image: onlyoffice/4testing-documentserver-ie:latest build:
context: ../.
environment: environment:
- REDIS_SERVER_HOST - REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-onlyoffice-redis}
- REDIS_SERVER_PORT - REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-6379}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:

10
tests/test.sh
View File

@ -6,16 +6,6 @@ if [[ ! -f $config ]]; then
exit 1 exit 1
fi fi
env_file=defaults.env
# Copy .env
if [[ -f $env_file ]]; then
cp $env_file .env
else
echo "File $env_file doesn't exist!"
exit 1
fi
# Run test environment # Run test environment
docker-compose -p ds -f $config up -d docker-compose -p ds -f $config up -d