public/docker-wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/docker synced 2025-12-13 09:46:27 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: public:2.3.3
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.4
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

9 Commits
2.3.3 ... 2.3.4

Author SHA1 Message Date
Jérémy Benoist
25bf47149f Merge pull request #132 from wallabag/release-2.3.4 
2.3.4
 2018-11-24 22:48:53 +01:00
Jeremy Benoist
0cee0470de Add missing PHP extension 2018-11-24 22:38:53 +01:00
Jeremy Benoist
b626873351 2.3.4 2018-11-24 21:57:13 +01:00
Jérémy Benoist
e741136827 Merge pull request #127 from Strubbl/patch-1 
Update docker-compose.mariadb.yml
 2018-10-15 20:27:05 +00:00
Jérémy Benoist
b92f4c2740 Merge pull request #119 from philwrenn/master 
Added SYMFONY__ENV__DATABASE_CHARSET envorinment variable to README.
 2018-10-15 19:34:19 +00:00
Strubbl
040655c3c4 Update docker-compose.mariadb.yml 
fix issue pointed out by @TofPlay in https://github.com/wallabag/wallabag/issues/3742#issuecomment-429947139
 2018-10-15 19:58:09 +02:00
Jérémy Benoist
5f78ae9a21 Merge pull request #126 from burkemw3/patch-1 
Use alpine:latest instead of alpine:edge for base
 2018-10-13 06:00:04 +00:00
Matt Burke
e510f9db1b Use alpine:latest instead of alpine:edge for base 
While investigating of wallabag/wallabag#3723:
- I could not build wallabag docker image with edge
- I succeeded in building with latest
- building with latest resolved wallabag/wallabag#3723

Additionally, alpine recommends against using edge for end users ([0][]).

[0]: https://wiki.alpinelinux.org/wiki/Edge
 2018-10-10 20:08:41 -04:00
Philip Wrenn
7d7b1a846f added SYMFONY__ENV__DATABASE_CHARSET envorinment variable to README. 2018-08-12 08:45:44 -04:00
3 changed files with 9 additions and 4 deletions
Expand all files Collapse all files

6
Dockerfile
View File

@@ -1,8 +1,8 @@
FROM alpine:edge
FROM alpine:latest
LABEL maintainer "Marvin Steadfast <marvin@xsteadfastx.org>"
ARG WALLABAG_VERSION=2.3.3
ARG WALLABAG_VERSION=2.3.4
RUN set -ex \
&& apk update \
@@ -37,6 +37,8 @@ RUN set -ex \
php7-tokenizer \
php7-xml \
php7-zlib \
php7-sockets \
php7-xmlreader \
py-mysqldb \
py-psycopg2 \
py-simplejson \

6
README.md
View File

@@ -24,8 +24,9 @@ Default login is `wallabag:wallabag`.
- `-e SYMFONY__ENV__DATABASE_NAME=...`(defaults to "symfony", this is the name of the database 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_CHARSET=...` (defaults to utf8, this is the database charset to use)
- `-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_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)
@@ -54,7 +55,7 @@ For using MariaDB or MySQL you have to define some environment variables with th
```
$ docker run --name wallabag-db -e "MYSQL_ROOT_PASSWORD=my-secret-pw" -d mariadb
$ docker run --name wallabag --link wallabag-db:wallabag-db -e "MYSQL_ROOT_PASSWORD=my-secret-pw" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql" -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=3306" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -p 80:80 wallabag/wallabag
$ docker run --name wallabag --link wallabag-db:wallabag-db -e "MYSQL_ROOT_PASSWORD=my-secret-pw" -e "SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql" -e "SYMFONY__ENV__DATABASE_HOST=wallabag-db" -e "SYMFONY__ENV__DATABASE_PORT=3306" -e "SYMFONY__ENV__DATABASE_NAME=wallabag" -e "SYMFONY__ENV__DATABASE_USER=wallabag" -e "SYMFONY__ENV__DATABASE_PASSWORD=wallapass" -e "SYMFONY__ENV__DATABASE_CHARSET=utf8mb4" -p 80:80 wallabag/wallabag
```
## PostgreSQL
@@ -106,6 +107,7 @@ services:
- SYMFONY__ENV__DATABASE_NAME=wallabag
- SYMFONY__ENV__DATABASE_USER=wallabag
- SYMFONY__ENV__DATABASE_PASSWORD=wallapass
- SYMFONY__ENV__DATABASE_CHARSET=utf8mb4
- SYMFONY__ENV__MAILER_HOST=127.0.0.1
- SYMFONY__ENV__MAILER_USER=~
- SYMFONY__ENV__MAILER_PASSWORD=~

1
tests/docker-compose.mariadb.yml
View File

@@ -18,5 +18,6 @@ services:
- "127.0.0.1:80:80"
db:
image: mariadb
command: mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --character-set-client-handshake=FALSE
environment:
- MYSQL_ROOT_PASSWORD=wallaroot