aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-12-22 12:04:26 +0100
committerGravatar GitHub <noreply@github.com> 2018-12-22 12:04:26 +0100
commit949c2f3083e931bbc95611c5f25f92327e09b8ac (patch)
tree95be15ea800f48a7f8b64c60df0fe1d48a730b5a
parenta3b460b3a8843e67eb0e0955f82aaa4f979f2097 (diff)
Fix .gitignore take 3 (#2195)
* Fix .gitignore take 3 https://github.com/FreshRSS/FreshRSS/pull/2190 https://github.com/FreshRSS/FreshRSS/pull/2193 * Readme
-rw-r--r--.dockerignore6
-rw-r--r--CHANGELOG.md2
2 files changed, 4 insertions, 4 deletions
diff --git a/.dockerignore b/.dockerignore
index f8bcd3baf..fa42e0e9c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,3 @@
-.git/*
-data/*
-docs/*
+**/.git/
+**/data/
+**/docs/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a497526cc..c2096bf44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@
* Support for `HTTP_X_FORWARDED_PREFIX` to ease the use of reverse proxies [#2191](https://github.com/FreshRSS/FreshRSS/pull/2191)
* Updated Docker + Træfik + Let’s Encrypt deployment guide [#2189](https://github.com/FreshRSS/FreshRSS/pull/2189)
* Docker image updated to Alpine 3.8.2 with PHP 7.2.13 and Apache 2.4.35
- * Fix `.dockerignore` [#2190](https://github.com/FreshRSS/FreshRSS/pull/2190)
+ * Fix `.dockerignore` [#2195](https://github.com/FreshRSS/FreshRSS/pull/2195)
* I18n
* Occitan [#2110](https://github.com/FreshRSS/FreshRSS/pull/2110)
* SimplePie