[discourse-web] The docker image we're using uses an older brotli release, update command execution syntax



commit 73b8b5e80059a88c15f2da9484bbb3112bfc3305
Author: Andrea Veri <averi redhat com>
Date:   Fri Apr 26 17:41:58 2019 +0200

    The docker image we're using uses an older brotli release, update command execution syntax

 Dockerfile                             |  3 +++
 patches/01_brotli_force_argument.patch | 11 +++++++++++
 2 files changed, 14 insertions(+)
---
diff --git a/Dockerfile b/Dockerfile
index 69c1540..da465c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,6 +39,9 @@ RUN mkdir -p discourse && \
 
 WORKDIR $HOME
 
+COPY patches /tmp/patches
+RUN patch -p0 < /tmp/patches/01_brotli_force_argument.patch
+
 RUN mkdir -p ./tmp/pids/ && \
     ### Plugins
     #   - OAuth
diff --git a/patches/01_brotli_force_argument.patch b/patches/01_brotli_force_argument.patch
new file mode 100644
index 0000000..70b0ae6
--- /dev/null
+++ b/patches/01_brotli_force_argument.patch
@@ -0,0 +1,11 @@
+--- lib/tasks/assets.rake.orig 2019-04-26 15:30:02.169557186 +0200
++++ lib/tasks/assets.rake      2019-04-26 15:31:16.973758098 +0200
+@@ -117,7 +117,7 @@
+ 
+ # different brotli versions use different parameters
+ def brotli_command(path)
+-  "brotli -f --quality=11 #{path} --output=#{path}.br"
++  "brotli --force --quality 11 --input #{path} --output #{path}.br"
+ end
+ 
+ def brotli(path)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]