Skip to content
Snippets Groups Projects
Commit 2cf64069 authored by Pierre Ozoux's avatar Pierre Ozoux Committed by GitHub
Browse files

Merge pull request #7 from occrp/master

PNGQUANT_VERSION, GIFSICLE_VERSION, DISCOURSE_VERSION as build args, not envvars
parents dfe7676b d996898c
No related branches found
No related tags found
No related merge requests found
......@@ -2,15 +2,15 @@ FROM rails
WORKDIR /usr/src/app
ENV DISCOURSE_VERSION=1.7.0.beta3 \
RAILS_ENV=production \
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
ARG GIFSICLE_VERSION=1.87
ARG PNGQUANT_VERSION=2.4.1
RUN curl --silent --location https://deb.nodesource.com/setup_4.x | bash - \
&& apt-get update && apt-get install -y --no-install-recommends \
......@@ -42,6 +42,8 @@ RUN curl --silent --location https://deb.nodesource.com/setup_4.x | bash - \
&& rm -fr /tmp/* \
&& rm -rf /var/lib/apt/lists/*
ARG DISCOURSE_VERSION=1.7.0.beta3
RUN git clone --branch v${DISCOURSE_VERSION} https://github.com/discourse/discourse.git . \
&& git remote set-branches --add origin tests-passed \
&& bundle config build.nokogiri --use-system-libraries
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment