Commit Graph

339 Commits

Author SHA1 Message Date
537b502424 Update build.yml to build ARM docker images.
This commit allows Github actions to automatically create and publish Docker images for armv7 and arm64 architecture (e. g. Raspberry Pi).
2022-04-29 13:58:21 +02:00
bfd3fe3d55 Merge pull request #282 from wallabag/fix/composer-2.3 2022-04-04 07:15:20 +02:00
ed49d39db4 wallabag isn't compatible with Composer 2.3
Install the latest known 2.2 version instead.
2022-04-01 16:20:35 +02:00
983bfe094b Remove forced composer v1 2022-02-15 09:29:16 +01:00
37216dfd69 Publish Docker images 2.4.3 2022-02-14 19:52:08 +01:00
13862eca8f Merge pull request #280 from wallabag/2.4.3
2.4.3
2022-02-14 17:04:37 +01:00
55b4290605 2.4.3 2022-02-14 17:00:55 +01:00
7873719099 Merge pull request #254 from sethsimmons/patch-1
Add healthcheck and dependencies to docker-compose example
2021-07-02 17:30:24 +02:00
05d9d45a54 Add healthcheck and dependencies to docker-compose example
This PR adds in a health check that can used for reporting, monitoring, or autohealing, as well as a `depends_on` statement that ensures wallabag comes up only once the DB and Redis are up.

Update timeout/retries to be more sane
2021-07-02 11:14:24 -04:00
13818bd90e 2.4.2 2.4.2 2021-03-16 12:17:19 +01:00
1b5fe1a934 Add missing parameter server_name for 2.4.1 2.4.1 2021-01-05 15:09:39 +01:00
9d44149e4d 2.4.1 2021-01-05 15:00:15 +01:00
2b99017b25 Merge pull request #239 from wallabag/otp-issuer 2021-01-04 06:47:50 +01:00
a85e592e6e Merge pull request #240 from wallabag/update-readme 2021-01-04 06:47:18 +01:00
f4a8e5eadc Update README to include SYMFONY__ENV__DOMAIN_NAME in the quickstart
The default value of this variable leads to a lot of issues with assets
when new comers try wallabag. This change should reduce the occurrence of
this kind of issue.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-12-31 18:53:26 +01:00
f460f40b8c Add new parameter server_name for 2FA issuer
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-12-31 18:44:50 +01:00
58c3977a3c Merge pull request #238 from hoh/patch-1 2020-12-29 06:15:45 +01:00
aede9b9c98 Fix upgrading to 2.4 requires make and bash
Running `make update` requires make and bash to be installed.

Closes #237
2020-12-29 00:20:52 +01:00
749587fb4f Merge pull request #228 from wallabag/fix/env-prod-cli-parameter
Fix `-e=prod` parameter
2020-12-10 20:11:20 +01:00
6839862b04 Fix -e=prod parameter 2020-12-10 17:31:31 +01:00
f4f8bac984 Merge pull request #225 from wallabag/release-2.4.0
2.4.0
2.4.0
2020-12-10 16:11:05 +01:00
a04e494755 Update to 2.4.0 2020-12-10 16:04:00 +01:00
bd6e2b174e 2.4.0 2020-12-10 15:05:43 +01:00
e7ebbc69da Merge pull request #221 from egoexpress/egoexpress-alpine-312
Update Alpine base image to 3.12
2020-11-30 03:45:17 +01:00
c5df063ccb update Alpine base image to 3.12, change packages 2020-11-28 20:35:26 +01:00
d619c63e43 Merge pull request #223 from wallabag/github-actions
Ditch Travis to use GitHub Actions
2020-11-27 17:22:01 +01:00
7e43f2acfa Update badge in README 2020-11-27 14:52:31 +01:00
f02adb2504 Ditch Travis to use GitHub Actions
Jump to GitHub Actions mostly because I found them most reliable these days (weeks?) than Travis.
And also because the open source builds are very limited now.
2020-11-27 14:50:07 +01:00
0e7fa2bca7 Merge pull request #216 from wallabag/dependabot/add-v2-config-file
Create Dependabot config file
2020-10-16 13:21:03 +02:00
1f1dd12cc3 Create Dependabot config file 2020-10-16 10:45:04 +00:00
b291bf697e Merge pull request #189 from pando85/master
Remove ipv6 to avoid fail when ipv6 is not defined
2020-05-13 08:21:00 +02:00
511a2595bc Merge pull request #195 from ywoly/master
Set "expose_php" to "Off" in php.ini
2020-04-15 13:38:26 +02:00
6962f33ed7 Set "expose_php" to "Off" in php.ini 2020-04-15 12:15:32 +02:00
836f9871ef Merge pull request #194 from wallabag/feature/two-factor
Add env variables for two-factor auth
2020-04-15 12:01:10 +02:00
d02c1a404a Add env variables for two-factor auth 2020-04-15 09:24:48 +02:00
b8ab40b6b4 Remove ipv6 to avoid fail when ipv6 is not defined 2020-04-13 20:00:11 +02:00
2cd061f08d Merge pull request #183 from ivzhh/master
Prepare for wallabag 2.4
2020-03-27 15:54:48 +01:00
1693adc27c Prepare for wallabag 2.4
Problem: I try to build image for wallabag 2.4-dev as of Feb 29, 2020.
The building fails due to two missing packages:

* py-mysqldb
* py-psycopg2

It seems these two packages are included in alpine:3.10, not yet in
alpine:latest. After launching wallabag 2.4-dev, a zhihu page reports
error and wallabag suggests to install php7-intl.

Solution:

* Fix alpine version to 3.10. The reason is also to avoid
CVE-2019-5021 (alpine set root password to NULL). 3.10 is not affected.
In case some users use tag 3.9 and happen to have 3.9.2, then they may
be affected.
* Add php7-intl to meet new requirement
2020-02-29 08:40:31 -07:00
a444f0db9d Merge pull request #173 from hoh/patch-1
Fix Nginx was not binding on IPv6
2019-12-05 18:15:01 -08:00
b98d38cbed Fix Nginx was not binding on IPv6
Problem: Nginx is only binding to the IPv4. Deployments with IPv6 require forking the image or overwriting `nginx.conf`.

Solution: Edit `nginx.conf` to listen to both IPv4 and IPv6 by making it listen on `[::]:80`.

Note: This may be related and contradictory to #54
2019-12-05 23:46:46 +01:00
6c548be161 Update README.md
See https://github.com/wallabag/docker/issues/152#issuecomment-561118356
2019-12-03 16:44:19 -08:00
174fa565eb Merge pull request #169 from cstuder/patch-1
Readme: Fixes link to documentation
2019-10-31 14:30:31 +01:00
45989b38de Readme: Fixes link to documentation 2019-10-30 17:25:17 +01:00
af075af5d8 Merge pull request #160 from sviande/config_sentry
Sentry: fix template parameters
2019-06-19 10:20:49 +02:00
51a60408e1 Sentry: fix template parameters 2019-06-19 10:06:02 +02:00
bea6b2fcc6 Merge pull request #159 from sviande/config_sentry
Config: add sentry_dsn entry
2019-06-18 20:28:39 +02:00
e189338065 Config: add sentry_dsn entry 2019-06-18 20:11:08 +02:00
8595085d6b Merge pull request #158 from brouberol/patch-1
Fix iconv setup to make it support non-ASCII encodings
2019-06-14 20:32:36 +02:00
503114fcba Fix iconv/musl
This PR adds 2 instructions to the Docker image build, making sure that `iconv` is setup properly.

This fixes https://github.com/wallabag/wallabag/issues/4011

For more context about the actual underlying issue that this fixes, you can read up
* https://github.com/docker-library/php/issues/240
* https://github.com/docker-library/php/issues/428

Kind regards
2019-06-14 13:44:59 +02:00
88bf8bb86d Merge pull request #106 from glego/add-secure-email
Add secure email
2019-06-05 11:39:08 +02:00