From 1d41effebc613b91bb84404711fb555f050a1700 Mon Sep 17 00:00:00 2001 From: Fabien MEURILLON Date: Sat, 9 Jan 2016 17:27:21 +0100 Subject: [PATCH] Add Docker configuration for Postgres and MariaDB --- .gitignore | 3 ++- app/config/parameters.yml.dist | 10 ++++++++++ docker-compose.yml | 25 +++++++++++++++++++++++++ docker/mariadb/env | 10 ++++++++++ docker/php/env | 6 ++++++ docker/postgres/env | 9 +++++++++ 6 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 docker/mariadb/env create mode 100644 docker/php/env create mode 100644 docker/postgres/env diff --git a/.gitignore b/.gitignore index 0495cb17..f88370d7 100644 --- a/.gitignore +++ b/.gitignore @@ -37,5 +37,6 @@ data/assets/* data/db/wallabag*.sqlite -# Docker container logs +# Docker container logs and data docker/logs/ +docker/data/ diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index a769bc66..0c0cbff1 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -1,5 +1,15 @@ # This file is a "template" of what your parameters.yml file should look like parameters: + # Uncomment these settings or manually update your parameters.yml + # to use docker-compose + # + # database_driver: %env.database_driver% + # database_host: %env.database_host% + # database_port: %env.database_port% + # database_name: %env.database_name% + # database_user: %env.database_user% + # database_password: %env.database_password% + database_driver: pdo_sqlite database_host: 127.0.0.1 database_port: ~ diff --git a/docker-compose.yml b/docker-compose.yml index bc469419..c774b621 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,3 +15,28 @@ php: - "9000:9000" volumes: - .:/var/www/html + #links: + # - "postgres:rdbms" + # - "mariadb:rdbms" + env_file: + - ./docker/php/env + # Comment non-used DBMS lines + # If all DBMS are commented out, sqlite will be used as default + # - ./docker/postgres/env + # - ./docker/mariadb/env +#postgres: +# image: postgres:9 +# ports: +# - "5432:5432" +# volumes: +# - ./docker/data/pgsql:/var/lib/postgresql/data +# env_file: +# - ./docker/postgres/env +#mariadb: +# image: mariadb:10 +# ports: +# - "3306:3306" +# volumes: +# - ./docker/data/mariadb:/var/lib/mysql +# env_file: +# - ./docker/mariadb/env diff --git a/docker/mariadb/env b/docker/mariadb/env new file mode 100644 index 00000000..87556a15 --- /dev/null +++ b/docker/mariadb/env @@ -0,0 +1,10 @@ +MYSQL_ROOT_PASSWORD=wallaroot +MYSQL_USER=wallabag +MYSQL_PASSWORD=wallapass +MYSQL_DATABASE=wallabag +SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql +SYMFONY__ENV__DATABASE_HOST=rdbms +SYMFONY__ENV__DATABASE_PORT=3306 +SYMFONY__ENV__DATABASE_NAME=wallabag +SYMFONY__ENV__DATABASE_USER=wallabag +SYMFONY__ENV__DATABASE_PASSWORD=wallapass diff --git a/docker/php/env b/docker/php/env new file mode 100644 index 00000000..935134fc --- /dev/null +++ b/docker/php/env @@ -0,0 +1,6 @@ +SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite +SYMFONY__ENV__DATABASE_HOST=127.0.0.1 +SYMFONY__ENV__DATABASE_PORT=~ +SYMFONY__ENV__DATABASE_NAME=symfony +SYMFONY__ENV__DATABASE_USER=root +SYMFONY__ENV__DATABASE_PASSWORD=~ diff --git a/docker/postgres/env b/docker/postgres/env new file mode 100644 index 00000000..80c78c2a --- /dev/null +++ b/docker/postgres/env @@ -0,0 +1,9 @@ +POSTGRES_USER=wallabag +POSTGRES_PASSWORD=wallapass +POSTGRES_DB=wallabag +export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql +export SYMFONY__ENV__DATABASE_HOST=rdbms +export SYMFONY__ENV__DATABASE_PORT=5432 +export SYMFONY__ENV__DATABASE_NAME=wallabag +export SYMFONY__ENV__DATABASE_USER=wallabag +export SYMFONY__ENV__DATABASE_PASSWORD=wallapass -- 2.41.0