1
0
mirror of https://github.com/wallabag/docker synced 2025-12-13 17:56:31 +00:00

8 Commits
2.0.4 ... 2.0.7

Author SHA1 Message Date
Marvin Steadfast
b165d3c14f Update Dockerfile for 2.0.7 release 2016-08-23 09:34:30 +02:00
Nicolas Lœuillet
8ce69e0d48 Merge pull request #13 from nsteinmetz/patch-1
Update Dockerfile for 2.0.6 release
2016-08-10 17:57:56 +02:00
Nicolas Steinmetz
3c96d9d6d9 Update Dockerfile for 2.0.6 release 2016-08-10 17:55:39 +02:00
xsteadfastx
fdffa0f9ec Merge pull request #11 from sheeprine/fix/body_size_limit
Increase max body size from nginx
2016-07-21 13:56:48 +02:00
Stéphane Albert
6a67881572 Increase max body size from nginx
With the default client_max_body_size (1M), import cannot be used.
Raise the limit to 50M.
2016-07-21 13:38:03 +02:00
xsteadfastx
038bef09cd Merge pull request #10 from davidmehren/master
Make email settings configurable
2016-06-13 09:27:43 +02:00
David Mehren
26b75eee75 made email server settings configurable 2016-06-11 15:43:04 +02:00
Marvin Steadfast
025c51422e new version 2.0.4 2016-06-01 09:42:10 +02:00
4 changed files with 22 additions and 8 deletions

View File

@@ -1,14 +1,19 @@
FROM alpine:edge FROM alpine:edge
MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org> MAINTAINER Marvin Steadfast <marvin@xsteadfastx.org>
ENV WALLABAG_VERSION=2.0.4 \ ENV WALLABAG_VERSION=2.0.7 \
SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite \ SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite \
SYMFONY__ENV__DATABASE_HOST=127.0.0.1 \ SYMFONY__ENV__DATABASE_HOST=127.0.0.1 \
SYMFONY__ENV__DATABASE_PORT=~ \ SYMFONY__ENV__DATABASE_PORT=~ \
SYMFONY__ENV__DATABASE_NAME=symfony \ SYMFONY__ENV__DATABASE_NAME=symfony \
SYMFONY__ENV__DATABASE_USER=root \ SYMFONY__ENV__DATABASE_USER=root \
SYMFONY__ENV__DATABASE_PASSWORD=~ \ SYMFONY__ENV__DATABASE_PASSWORD=~ \
SYMFONY__ENV__SECRET=ovmpmAWXRCabNlMgzlzFXDYmCFfzGv 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 \

View File

@@ -19,7 +19,10 @@ Default login is `wallabag:wallabag`.
- `-e SYMFONY__ENV__DATABASE_USER=...` (defaults to "root", this is the name of the database user to use) - `-e SYMFONY__ENV__DATABASE_USER=...` (defaults to "root", this is the name of the database user to use)
- `-e SYMFONY__ENV__DATABASE_PASSWORD=...` (defaults to "~", this is the password of the database user to use) - `-e SYMFONY__ENV__DATABASE_PASSWORD=...` (defaults to "~", this is the password of the database user to use)
- `-e SYMFONY__ENV__SECRET=...` (defaults to "ovmpmAWXRCabNlMgzlzFXDYmCFfzGv") - `-e SYMFONY__ENV__SECRET=...` (defaults to "ovmpmAWXRCabNlMgzlzFXDYmCFfzGv")
- `-e SYMFONY__ENV__MAILER_HOST=...` defaults to "127.0.0.1", the SMTP host)
- `-e SYMFONY__ENV__MAILER_USER=...` (defaults to "~", the SMTP user)
- `-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)
## sqlite ## sqlite
The easiest way to start wallabag is to use the sqlite backend. You can spin that up with The easiest way to start wallabag is to use the sqlite backend. You can spin that up with
@@ -69,6 +72,10 @@ services:
- SYMFONY__ENV__DATABASE_NAME=wallabag - SYMFONY__ENV__DATABASE_NAME=wallabag
- SYMFONY__ENV__DATABASE_USER=wallabag - SYMFONY__ENV__DATABASE_USER=wallabag
- SYMFONY__ENV__DATABASE_PASSWORD=wallapass - SYMFONY__ENV__DATABASE_PASSWORD=wallapass
- SYMFONY__ENV__MAILER_HOST=127.0.0.1
- SYMFONY__ENV__MAILER_USER=~
- SYMFONY__ENV__MAILER_PASSWORD=~
- SYMFONY__ENV__FROM_EMAIL=wallabag@example.com
ports: ports:
- "80" - "80"
db: db:
@@ -78,6 +85,7 @@ services:
volumes: volumes:
- /opt/wallabag:/var/lib/mysql - /opt/wallabag:/var/lib/mysql
``` ```
Note that you must fill out the mail related variables according to your mail config.
## nginx ## nginx

View File

@@ -23,6 +23,7 @@ http {
gzip on; gzip on;
gzip_disable "msie6"; gzip_disable "msie6";
open_file_cache max=100; open_file_cache max=100;
client_max_body_size 50M;
upstream php-upstream { upstream php-upstream {

View File

@@ -17,9 +17,9 @@ parameters:
test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
mailer_transport: smtp mailer_transport: smtp
mailer_host: 127.0.0.1 mailer_host: %env.mailer_host%
mailer_user: ~ mailer_user: %env.mailer_user%
mailer_password: ~ mailer_password: %env.mailer_password%
locale: en locale: en
@@ -28,9 +28,9 @@ parameters:
# two factor stuff # two factor stuff
twofactor_auth: true twofactor_auth: true
twofactor_sender: no-reply@wallabag.org twofactor_sender: %env.from_email%
# fosuser stuff # fosuser stuff
fosuser_confirmation: true fosuser_confirmation: true
from_email: no-reply@wallabag.org from_email: %env.from_email%