public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-14 10:16:35 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: public:2.3.0
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1
..
compare: public:2.3.1
Branches Tags
public:master public:rewrite
public:2.6.14 public:2.6.13 public:2.6.12 public:2.6.11 public:2.6.10 public:2.6.9 public:2.6.8 public:2.6.7 public:2.6.6 public:2.6.5 public:2.6.4 public:2.6.3 public:2.6.2 public:2.6.1 public:2.5.4 public:2.5.3 public:2.5.2 public:2.5.1 public:2.5.0 public:2.5.0-rc.1 public:2.4.3 public:2.4.2 public:2.4.1 public:2.4.0 public:2.3.8 public:2.3.7 public:2.3.6 public:2.3.5 public:2.3.4 public:2.3.3 public:2.3.2 public:2.3.1 public:2.3.0 public:2.2.3 public:2.2.2 public:2.2.1 public:2.1.6 public:2.1.4 public:2.1.3 public:2.1.2 public:2.1.1 public:2.0.8 public:2.0.7 public:2.0.6 public:2.0.5 public:2.0.4 public:2.0.3 public:2.0.2 public:2.0.1

8 Commits
2.3.0 ... 2.3.1

Author SHA1 Message Date
Nicolas Lœuillet
bf0316bac6 Merge pull request #95 from wallabag/nicosomb-patch-1 
wallabag 2.3.1
 2017-12-26 22:23:26 +01:00
Nicolas Lœuillet
ae7aefe8e4 Updated parameters for 2.3.1 2017-12-26 21:35:43 +01:00
Nicolas Lœuillet
ef910d313c wallabag 2.3.1 2017-12-26 21:12:13 +01:00
Nicolas Lœuillet
51e3b625c0 Merge pull request #87 from bananenmannfrau/master 
makes email confirmation for user registration configurable
 2017-12-15 14:49:21 +01:00
Nicolas Lœuillet
dcaa684897 Updated README 2017-12-15 14:32:20 +01:00
bananenmannfrau
6edcd745c4 makes email confirmation for user registration configurable 2017-12-15 14:31:11 +01:00
Nicolas Lœuillet
7a476cdab0 Merge pull request #84 from Dehalion/master 
allow to override database_charset and locale with env variables
 2017-12-13 23:02:33 +01:00
David Prem
b67e80a9f8 allow to override database_charset and locale with env variables 2017-09-20 18:06:33 +02:00
5 changed files with 10 additions and 4 deletions
Expand all files Collapse all files

2
Dockerfile
View File

@@ -2,7 +2,7 @@ FROM alpine:edge
LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>" LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"
ARG WALLABAG_VERSION=2.3.0 ARG WALLABAG_VERSION=2.3.1
RUN set -ex \ RUN set -ex \
&& apk update \ && apk update \

1
README.md
View File

@@ -29,6 +29,7 @@ Default login is `wallabag:wallabag`.
- `-e SYMFONY__ENV__MAILER_PASSWORD=...`(defaults to "~", the SMTP password) - `-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__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__FOSUSER_REGISTRATION=...`(defaults to "true", enable or disable public user registration)
- `-e SYMFONY__ENV__FOSUSER_CONFIRMATION=...`(defaults to "true", enable or disable registration confirmation)
- `-e SYMFONY__ENV__DOMAIN_NAME=...` defaults to "https://your-wallabag-url-instance.com", the URL of your wallabag instance) - `-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) - `-e POPULATE_DATABASE=...`(defaults to "True". Does the DB has to be populated or is it an existing one)

3
root/etc/ansible/entrypoint.yml
View File

@@ -13,13 +13,16 @@
database_root_user_postgres: "{{ lookup('env', 'POSTGRES_USER') }}" database_root_user_postgres: "{{ lookup('env', 'POSTGRES_USER') }}"
database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}" database_root_password_postgres: "{{ lookup('env', 'POSTGRES_PASSWORD') }}"
database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER')|default('root', true) }}" database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER')|default('root', true) }}"
database_charset: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_CHARSET')|default('utf8', true) }}"
populate_database: "{{ lookup('env', 'POPULATE_DATABASE')|default(True, true) }}" populate_database: "{{ lookup('env', 'POPULATE_DATABASE')|default(True, true) }}"
locale: "{{ lookup('env', 'SYMFONY__ENV__LOCALE')|default('en', true) }}"
secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}" secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}"
mailer_host: "{{ lookup('env', 'SYMFONY__ENV__MAILER_HOST')|default('127.0.0.1', true) }}" mailer_host: "{{ lookup('env', 'SYMFONY__ENV__MAILER_HOST')|default('127.0.0.1', true) }}"
mailer_user: "{{ lookup('env', 'SYMFONY__ENV__MAILER_USER')|default('~', true) }}" mailer_user: "{{ lookup('env', 'SYMFONY__ENV__MAILER_USER')|default('~', true) }}"
mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}" mailer_password: "{{ lookup('env', 'SYMFONY__ENV__MAILER_PASSWORD')|default('~', true) }}"
from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}" from_email: "{{ lookup('env', 'SYMFONY__ENV__FROM_EMAIL')|default('wallabag@example.com', true) }}"
registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}" registration: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_REGISTRATION')|default('true', true) }}"
registration_mail_confirmation: "{{ lookup('env', 'SYMFONY__ENV__FOSUSER_CONFIRMATION')|default('true', true) }}"
domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}" domain_name: "{{ lookup('env', 'SYMFONY__ENV__DOMAIN_NAME')|default('https://your-wallabag-url-instance.com', true) }}"
tasks: tasks:

7
root/etc/ansible/templates/parameters.yml.j2
View File

@@ -8,7 +8,8 @@ parameters:
database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
database_table_prefix: wallabag_ database_table_prefix: wallabag_
database_socket: null database_socket: null
database_charset: utf8 database_charset: {{ database_charset }}
database_driver_class: null
domain_name: {{ domain_name }} domain_name: {{ domain_name }}
@@ -17,7 +18,7 @@ parameters:
mailer_user: {{ mailer_user }} mailer_user: {{ mailer_user }}
mailer_password: {{ mailer_password }} mailer_password: {{ mailer_password }}
locale: en locale: {{ locale }}
# A secret key that's used to generate certain security-related tokens # A secret key that's used to generate certain security-related tokens
secret: {{ secret }} secret: {{ secret }}
@@ -28,7 +29,7 @@ parameters:
# fosuser stuff # fosuser stuff
fosuser_registration: {{ registration }} fosuser_registration: {{ registration }}
fosuser_confirmation: true fosuser_confirmation: {{ registration_mail_confirmation }}
from_email: {{ from_email }} from_email: {{ from_email }}

1
root/var/www/wallabag/app/config/parameters.yml
View File

@@ -9,6 +9,7 @@ parameters:
database_table_prefix: wallabag_ database_table_prefix: wallabag_
database_socket: null database_socket: null
database_charset: utf8 database_charset: utf8
database_driver_class: null
domain_name: https://your-wallabag-url-instance.com domain_name: https://your-wallabag-url-instance.com