From a9014fa6faa1282b618b6418b5d27b11f74f90b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20=27rysiek=27=20Wo=C5=BAniak?=
<rysiek@hackerspace.pl>
Date: Wed, 14 Dec 2016 12:56:09 +0100
Subject: [PATCH] since they're used at build time, PNGQUANT_VERSION,
GIFSICLE_VERSION, DISCOURSE_VERSION should be build args, not envvars
---
Dockerfile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index f7e5e4b..ba50d91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,15 +2,16 @@ FROM rails
WORKDIR /usr/src/app
-ENV DISCOURSE_VERSION=1.7.0.beta3 \
- RAILS_ENV=production \
+ARG DISCOURSE_VERSION=1.7.0.beta3
+ARG GIFSICLE_VERSION=1.87
+ARG PNGQUANT_VERSION=2.4.1
+
+ENV RAILS_ENV=production \
RUBY_GC_MALLOC_LIMIT=90000000 \
RUBY_GLOBAL_METHOD_CACHE_SIZE=131072 \
DISCOURSE_DB_HOST=postgres \
DISCOURSE_REDIS_HOST=redis \
- DISCOURSE_SERVE_STATIC_ASSETS=true \
- GIFSICLE_VERSION=1.87 \
- PNGQUANT_VERSION=2.4.1
+ DISCOURSE_SERVE_STATIC_ASSETS=true
RUN curl --silent --location https://deb.nodesource.com/setup_4.x | bash - \
&& apt-get update && apt-get install -y --no-install-recommends \
--
GitLab