From e6736684f19052ee236821856b5ac0d30267bd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Thu, 6 Aug 2020 20:06:31 +0200 Subject: [PATCH] [Docker/Travis] Added experimental PostgreSQL service --- .travis.yml | 6 +++--- doc/docker/README.md | 1 + doc/docker/db-postgresql.yml | 22 ++++++++++++++++++++++ 3 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 doc/docker/db-postgresql.yml diff --git a/.travis.yml b/.travis.yml index 1d5750b035..54d6364595 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,11 +59,11 @@ matrix: - SETUP_BEHAT_OPTS="--profile=setup --suite=personas --tags=@setup" - BEHAT_OPTS="--profile=adminui --suite=personas" - if: type in (cron, api) - name: "[PHP 7.1] Admin UI on Clean Platform" + name: "[PHP 7.1/PostgreSQL] Admin UI on Clean Platform" env: + - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/db-postgresql.yml:doc/docker/selenium.yml" - BEHAT_OPTS="--profile=adminui --suite=adminui" - - PHP_IMAGE=ezsystems/php:7.1-v1-node - - PHP_IMAGE_DEV=ezsystems/php:7.1-v1-dev + - PHP_IMAGE=ezsystems/php:7.1-v2-node10 # reduce depth (history) of git checkout git: diff --git a/doc/docker/README.md b/doc/docker/README.md index cf047d8095..b4c43d5f3d 100644 --- a/doc/docker/README.md +++ b/doc/docker/README.md @@ -43,6 +43,7 @@ The current Docker Compose files are made to be mixed and matched together for Q - redis-session.yml _(optional, stores sessions in a separate redis instance)_ - varnish.yml _(optional, adds varnish service and appends config to app)_ - solr.yml _(optional, add solr service and configure app for it)_ +- db-postgresql.yml _(optional, switches the DB engine to PostgreSQL - experimental)_ - selenium.yml _(optional, always needs to be last, adds selenium service and appends config to app)_ - multihost.yml _(optional, adds multihost config to app container network)_ diff --git a/doc/docker/db-postgresql.yml b/doc/docker/db-postgresql.yml new file mode 100644 index 0000000000..72a30d31a5 --- /dev/null +++ b/doc/docker/db-postgresql.yml @@ -0,0 +1,22 @@ +version: '3.3' +# Single server setup for dev + +services: + app: + environment: + - DATABASE_PORT=5432 + - DATABASE_DRIVER=pdo_pgsql + - DATABASE_PLATFORM=pgsql + - DATABASE_CHARSET=utf8 + - DATABASE_VERSION=9.4 + + db: + image: postgres:9.4 + environment: + - POSTGRES_USER=$DATABASE_USER + - POSTGRES_PASSWORD=$DATABASE_PASSWORD + - POSTGRES_DB=$DATABASE_NAME + networks: + - backend + ports: + - "5433:5432"