summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-07-13 15:19:39 +0200
committerGravatar GitHub <noreply@github.com> 2019-07-13 15:19:39 +0200
commita394d7ab10dbaaca78cc8ca3c6536d7a808d7931 (patch)
tree321d167d8067593a3ee83deb760c8d8691ac7b2c
parent93bef33e1f5493c95c81c9d44f34aed70880768f (diff)
Docker Hub readme (#2441)
* Docker Hub readme Try to use anothe readme. And update info for https://alpinelinux.org/posts/Alpine-3.10.1-released.html * Test another variant * /tmp/ did not work
-rw-r--r--CHANGELOG.md2
-rw-r--r--Docker/hooks/post_checkout4
-rwxr-xr-xDocker/hooks/pre_build2
3 files changed, 5 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f548bc86b..4b734e22f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@
* Docker: Add automatic health check [#2438](https://github.com/FreshRSS/FreshRSS/pull/2438)
* Docker: Add a version for ARM achitecture such as for Raspberry Pi [#2436](https://github.com/FreshRSS/FreshRSS/pull/2436)
* Docker: Ubuntu image updated to 19.04 with PHP 7.2.19 and Apache 2.4.38 [#2422](https://github.com/FreshRSS/FreshRSS/pull/2422)
- * Docker: Alpine image updated to 3.10 with PHP 7.3.6 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
+ * Docker: Alpine image updated to 3.10 with PHP 7.3.7 and Apache 2.4.39 [#2238](https://github.com/FreshRSS/FreshRSS/pull/2238)
* I18n
* Improve Occitan [#2358](https://github.com/FreshRSS/FreshRSS/pull/2358)
* Misc.
diff --git a/Docker/hooks/post_checkout b/Docker/hooks/post_checkout
new file mode 100644
index 000000000..b33c941e5
--- /dev/null
+++ b/Docker/hooks/post_checkout
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+mv ../README.md ../README.en.md
+mv README.md ../
diff --git a/Docker/hooks/pre_build b/Docker/hooks/pre_build
index 32074059c..5946b045b 100755
--- a/Docker/hooks/pre_build
+++ b/Docker/hooks/pre_build
@@ -1,7 +1,5 @@
#!/bin/bash
-cp README.md ../
-
if [[ "$DOCKERFILE_PATH" == *-ARM ]]
then
# https://github.com/balena-io/qemu