From 7b68684720e346054c41b9a2891514f35351ca6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 12 Dec 2017 22:28:19 +0100 Subject: [PATCH 1/2] Updated image to wallabag 2.3.0 --- Dockerfile | 2 +- README.md | 1 + root/etc/ansible/entrypoint.yml | 1 + root/etc/ansible/templates/parameters.yml.j2 | 5 ++--- root/var/www/wallabag/app/config/parameters.yml | 5 ++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b361a10..12f865a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM alpine:edge LABEL maintainer "Marvin Steadfast " -ARG WALLABAG_VERSION=2.2.3 +ARG WALLABAG_VERSION=2.3.0 RUN set -ex \ && apk update \ diff --git a/README.md b/README.md index 90b3cd1..fdee7e1 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,7 @@ Default login is `wallabag:wallabag`. - `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password) - `-e SYMFONY__ENV__FROM_EMAIL=...`(defaults to "wallabag@example.com", the address wallabag uses for outgoing emails) - `-e SYMFONY__ENV__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration) +- `-e SYMFONY__ENV__DOMAIN_NAME=...` defaults to "https://your-wallabag-url-instance.com", the URL of your wallabag instance) - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one) ## SQLite diff --git a/root/etc/ansible/entrypoint.yml b/root/etc/ansible/entrypoint.yml index 231cf81..f6b5210 100644 --- a/root/etc/ansible/entrypoint.yml +++ b/root/etc/ansible/entrypoint.yml @@ -20,6 +20,7 @@ mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}" from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}" registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}" + domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}" tasks: diff --git a/root/etc/ansible/templates/parameters.yml.j2 b/root/etc/ansible/templates/parameters.yml.j2 index f9f7270..9d23ffe 100644 --- a/root/etc/ansible/templates/parameters.yml.j2 +++ b/root/etc/ansible/templates/parameters.yml.j2 @@ -10,6 +10,8 @@ parameters: database_socket: null database_charset: utf8 + domain_name: {{ domain_name }} + mailer_transport: smtp mailer_host: {{ mailer_host }} mailer_user: {{ mailer_user }} @@ -45,6 +47,3 @@ parameters: redis_port: 6379 redis_path: null redis_password: null - - # sites credentials - sites_credentials: {} diff --git a/root/var/www/wallabag/app/config/parameters.yml b/root/var/www/wallabag/app/config/parameters.yml index 4ad5739..9469a83 100644 --- a/root/var/www/wallabag/app/config/parameters.yml +++ b/root/var/www/wallabag/app/config/parameters.yml @@ -10,6 +10,8 @@ parameters: database_socket: null database_charset: utf8 + domain_name: https://your-wallabag-url-instance.com + test_database_driver: pdo_sqlite test_database_host: 127.0.0.1 test_database_port: ~ @@ -53,6 +55,3 @@ parameters: redis_port: 6379 redis_path: null redis_password: null - - # sites credentials - sites_credentials: {} From e5456115c1d55b88359e072fce3526a46e7094d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 13 Dec 2017 22:32:43 +0100 Subject: [PATCH 2/2] Forced postgres 9.6 --- README.md | 2 +- tests/docker-compose.postgresql.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fdee7e1..feca906 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ $ docker run --name wallabag --link wallabag-db:wallabag-db -e "MYSQL_ROOT_PASSW For using PostgreSQL you have to define some environment variables with the container. Example: ``` -$ docker run --name wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -d postgres +$ docker run --name wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -d postgres:9.6 $ docker run --name wallabag --link wallabag-db:wallabag-db -e "POSTGRES_PASSWORD=my-secret-pw" -e "POSTGRES_USER=my-super-user" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql" -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=5432" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -p 80:80 wallabag/wallabag ``` diff --git a/tests/docker-compose.postgresql.yml b/tests/docker-compose.postgresql.yml index 00fcc43..6c173c3 100644 --- a/tests/docker-compose.postgresql.yml +++ b/tests/docker-compose.postgresql.yml @@ -18,7 +18,7 @@ services: ports: - "127.0.0.1:80:80" db: - image: postgres + image: postgres:9.6 environment: - POSTGRES_PASSWORD=my-secret-pw - POSTGRES_USER=my-super-user