public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-15 18:56:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #25 from xsteadfastx/master

Browse Source 
version 2.1.2 and some cleanups
This commit is contained in:
xsteadfastx
2016-10-19 11:30:00 +02:00
committed by GitHub
parent af2fb30389 ed6b4437b8
commit e0bc4e895d
4 changed files with 16 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile
View File

@@ -1,20 +1,8 @@
FROM alpine:edge FROM alpine:edge
MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org> MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>
ENV WALLABAG_VERSION=2.1.1 \ ENV WALLABAG_VERSION=2.1.2 \
SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite \ POSTGRES_USER=postgres
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=~ \
POSTGRES_USER=postgres \
SYMFONY__ENV__SECRET=ovmpmAWXRCabNlMgzlzFXDYmCFfzGv \
SYMFONY__ENV__MAILER_HOST=127.0.0.1 \
SYMFONY__ENV__MAILER_USER=~ \
SYMFONY__ENV__MAILER_PASSWORD=~ \
SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ RUN echo "@testing http://dl-4.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& apk add --update \ && apk add --update \

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

@@ -13,6 +13,7 @@
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') }}" database_user: "{{ lookup('env', 'SYMFONY__ENV__DATABASE_USER') }}"
secret: "{{ lookup('env', 'SYMFONY__ENV__SECRET')|default('ovmpmAWXRCabNlMgzlzFXDYmCFfzGv', true) }}"
tasks: tasks:

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

@@ -7,6 +7,7 @@ parameters:
database_password: {{ database_password }} database_password: {{ database_password }}
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
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: 127.0.0.1
@@ -16,7 +17,7 @@ parameters:
locale: en locale: en
# 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: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv secret: {{ secret }}
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
@@ -37,5 +38,7 @@ parameters:
rabbitmq_password: guest rabbitmq_password: guest
# Redis processing # Redis processing
redis_scheme: tcp
redis_host: redis redis_host: redis
redis_port: 6379 redis_port: 6379
redis_path: null

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

@@ -1,12 +1,13 @@
parameters: parameters:
database_driver: %env.database_driver% database_driver: pdo_sqlite
database_host: %env.database_host% database_host: 127.0.0.1
database_port: %env.database_port% database_port: ~
database_name: %env.database_name% database_name: symfony
database_user: %env.database_user% database_user: root
database_password: %env.database_password% database_password: ~
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
test_database_driver: pdo_sqlite test_database_driver: pdo_sqlite
test_database_host: 127.0.0.1 test_database_host: 127.0.0.1
@@ -45,5 +46,7 @@ parameters:
rabbitmq_password: guest rabbitmq_password: guest
# Redis processing # Redis processing
redis_scheme: tcp
redis_host: localhost redis_host: localhost
redis_port: 6379 redis_port: 6379
redis_path: null