Lea/Docker-DocumentServer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix variable names

Browse source
This commit is contained in:
Semen Bezrukov 2020-04-28 14:19:38 +03:00
parent c146fb25f9
commit af1123e957
9 changed files with 52 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -8,11 +8,11 @@ env:
# custom values # custom values
- config: postgres.yml - config: postgres.yml
EXT_DB_NAME: mydb DB_NAME: mydb
EXT_DB_USER: myuser DB_USER: myuser
EXT_DB_PWD: password DB_PWD: password
EXT_POSTGRES_DB: mydb POSTGRES_DB: mydb
EXT_POSTGRES_USER: myuser POSTGRES_USER: myuser
# deprecated variables # deprecated variables
- config: postgres-old.yml - config: postgres-old.yml

8
tests/activemq.yml
View file

@ -5,8 +5,8 @@ services:
build: build:
context: ../. context: ../.
environment: environment:
- AMQP_TYPE=${EXT_AMQP_TYPE:-activemq} - AMQP_TYPE=${AMQP_TYPE:-activemq}
- AMQP_URI=${EXT_AMQP_URI:-amqp://guest:guest@onlyoffice-activemq} - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-activemq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -19,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=${EXT_ACTIVEMQ_USERS_guest:-guest} - ACTIVEMQ_USERS_guest=${ACTIVEMQ_USERS_guest:-guest}
- ACTIVEMQ_GROUPS_owners=${EXT_ACTIVEMQ_GROUPS_owners:-guest} - ACTIVEMQ_GROUPS_owners=${ACTIVEMQ_GROUPS_owners:-guest}
restart: always restart: always
networks: networks:
- onlyoffice - onlyoffice

20
tests/mariadb.yml
View file

@ -7,12 +7,12 @@ services:
depends_on: depends_on:
- onlyoffice-mariadb - onlyoffice-mariadb
environment: environment:
- DB_TYPE=${EXT_DB_TYPE:-mysql} - DB_TYPE=${DB_TYPE:-mysql}
- DB_HOST=${EXT_DB_HOST:-onlyoffice-mariadb} - DB_HOST=${DB_HOST:-onlyoffice-mariadb}
- DB_PORT=${EXT_DB_PORT:-3306} - DB_PORT=${DB_PORT:-3306}
- DB_NAME=${EXT_DB_NAME:-onlyoffice} - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER=${EXT_DB_USER:-onlyoffice} - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD=${EXT_DB_PWD:-onlyoffice} - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -22,10 +22,10 @@ services:
container_name: onlyoffice-mariadb container_name: onlyoffice-mariadb
image: mariadb:10.5 image: mariadb:10.5
environment: environment:
- MYSQL_DATABASE=${EXT_MYSQL_DATABASE:-onlyoffice} - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
- MYSQL_USER=${EXT_MYSQL_USER:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice}
- MYSQL_PASSWORD=${EXT_MYSQL_PASSWORD:-onlyoffice} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
- MYSQL_ALLOW_EMPTY_PASSWORD=${EXT_MYSQL_ALLOW_EMPTY_PASSWORD:-yes} - 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

20
tests/mysql.yml
View file

@ -7,12 +7,12 @@ services:
depends_on: depends_on:
- onlyoffice-mysql - onlyoffice-mysql
environment: environment:
- DB_TYPE=${EXT_DB_TYPE:-mysql} - DB_TYPE=${DB_TYPE:-mysql}
- DB_HOST=${EXT_DB_HOST:-onlyoffice-mysql} - DB_HOST=${DB_HOST:-onlyoffice-mysql}
- DB_PORT=${EXT_DB_PORT:-3306} - DB_PORT=${DB_PORT:-3306}
- DB_NAME=${EXT_DB_NAME:-onlyoffice} - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER=${EXT_DB_USER:-onlyoffice} - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD=${EXT_DB_PWD:-onlyoffice} - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -22,10 +22,10 @@ services:
container_name: onlyoffice-mysql container_name: onlyoffice-mysql
image: mysql:5.7 image: mysql:5.7
environment: environment:
- MYSQL_DATABASE=${EXT_MYSQL_DATABASE:-onlyoffice} - MYSQL_DATABASE=${MYSQL_DATABASE:-onlyoffice}
- MYSQL_USER=${EXT_MYSQL_USER:-onlyoffice} - MYSQL_USER=${MYSQL_USER:-onlyoffice}
- MYSQL_PASSWORD=${EXT_MYSQL_PASSWORD:-onlyoffice} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-onlyoffice}
- MYSQL_ALLOW_EMPTY_PASSWORD=${EXT_MYSQL_ALLOW_EMPTY_PASSWORD:-yes} - 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

16
tests/postgres-old.yml
View file

@ -7,11 +7,11 @@ services:
depends_on: depends_on:
- onlyoffice-postgresql - onlyoffice-postgresql
environment: environment:
- POSTGRESQL_SERVER_HOST=${EXT_DB_HOST:-onlyoffice-postgresql} - POSTGRESQL_SERVER_HOST=${DB_HOST:-onlyoffice-postgresql}
- POSTGRESQL_SERVER_PORT=${EXT_DB_PORT:-5432} - POSTGRESQL_SERVER_PORT=${DB_PORT:-5432}
- POSTGRESQL_SERVER_DB_NAME=${EXT_DB_NAME:-onlyoffice} - POSTGRESQL_SERVER_DB_NAME=${DB_NAME:-onlyoffice}
- POSTGRESQL_SERVER_USER=${EXT_DB_USER:-onlyoffice} - POSTGRESQL_SERVER_USER=${DB_USER:-onlyoffice}
- POSTGRESQL_SERVER_PASS=${EXT_DB_PWD:-onlyoffice} - POSTGRESQL_SERVER_PASS=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -21,9 +21,9 @@ services:
container_name: onlyoffice-postgresql container_name: onlyoffice-postgresql
image: postgres:9.5 image: postgres:9.5
environment: environment:
- POSTGRES_DB=${EXT_POSTGRES_DB:-onlyoffice} - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
- POSTGRES_USER=${EXT_POSTGRES_USER:-onlyoffice} - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
- POSTGRES_HOST_AUTH_METHOD=${EXT_POSTGRES_HOST_AUTH_METHOD:-trust} - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
restart: always restart: always
expose: expose:
- '5432' - '5432'

18
tests/postgres.yml
View file

@ -7,12 +7,12 @@ services:
depends_on: depends_on:
- onlyoffice-postgresql - onlyoffice-postgresql
environment: environment:
- DB_TYPE=${EXT_DB_TYPE:-postgres} - DB_TYPE=${DB_TYPE:-postgres}
- DB_HOST=${EXT_DB_HOST:-onlyoffice-postgresql} - DB_HOST=${DB_HOST:-onlyoffice-postgresql}
- DB_PORT=${EXT_DB_PORT:-5432} - DB_PORT=${DB_PORT:-5432}
- DB_NAME=${EXT_DB_NAME:-onlyoffice} - DB_NAME=${DB_NAME:-onlyoffice}
- DB_USER=${EXT_DB_USER:-onlyoffice} - DB_USER=${DB_USER:-onlyoffice}
- DB_PWD=${EXT_DB_PWD:-onlyoffice} - DB_PWD=${DB_PWD:-onlyoffice}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:
@ -22,9 +22,9 @@ services:
container_name: onlyoffice-postgresql container_name: onlyoffice-postgresql
image: postgres:9.5 image: postgres:9.5
environment: environment:
- POSTGRES_DB=${EXT_POSTGRES_DB:-onlyoffice} - POSTGRES_DB=${POSTGRES_DB:-onlyoffice}
- POSTGRES_USER=${EXT_POSTGRES_USER:-onlyoffice} - POSTGRES_USER=${POSTGRES_USER:-onlyoffice}
- POSTGRES_HOST_AUTH_METHOD=${EXT_POSTGRES_HOST_AUTH_METHOD:-trust} - POSTGRES_HOST_AUTH_METHOD=${POSTGRES_HOST_AUTH_METHOD:-trust}
restart: always restart: always
expose: expose:
- '5432' - '5432'

4
tests/rabbitmq-old.yml
View file

@ -5,8 +5,8 @@ services:
build: build:
context: ../. context: ../.
environment: environment:
- AMQP_SERVER_TYPE=${EXT_AMQP_SERVER_TYPE:-rabbitmq} - AMQP_SERVER_TYPE=${AMQP_SERVER_TYPE:-rabbitmq}
- AMQP_SERVER_URL=${EXT_AMQP_SERVER_URL:-amqp://guest:guest@onlyoffice-rabbitmq} - AMQP_SERVER_URL=${AMQP_SERVER_URL:-amqp://guest:guest@onlyoffice-rabbitmq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:

4
tests/rabbitmq.yml
View file

@ -5,8 +5,8 @@ services:
build: build:
context: ../. context: ../.
environment: environment:
- AMQP_TYPE=${EXT_AMQP_TYPE:-rabbitmq} - AMQP_TYPE=${AMQP_TYPE:-rabbitmq}
- AMQP_URI=${EXT_AMQP_URI:-amqp://guest:guest@onlyoffice-rabbitmq} - AMQP_URI=${AMQP_URI:-amqp://guest:guest@onlyoffice-rabbitmq}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports:

4
tests/redis.yml
View file

@ -5,8 +5,8 @@ services:
build: build:
context: ../. context: ../.
environment: environment:
- REDIS_SERVER_HOST=${EXT_REDIS_SERVER_HOST:-onlyoffice-redis} - REDIS_SERVER_HOST=${REDIS_SERVER_HOST:-onlyoffice-redis}
- REDIS_SERVER_PORT=${EXT_REDIS_SERVER_PORT:-6379} - REDIS_SERVER_PORT=${REDIS_SERVER_PORT:-6379}
stdin_open: true stdin_open: true
restart: always restart: always
ports: ports: