From fe9847a5187e04711282d0a1c4325bfe5de47c8c Mon Sep 17 00:00:00 2001 From: cyril Date: Fri, 8 Apr 2016 06:02:09 +0200 Subject: [PATCH] update Dockerfile + env.example --- Dockerfile | 4 ++-- docker/env.example | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index cbb71eeca..3d0800729 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.2 +FROM ruby:2.3 MAINTAINER peng@sleede.com # cf: nginx Dockerfile : https://github.com/nginxinc/docker-nginx @@ -23,7 +23,7 @@ RUN bundle config --global frozen 1 WORKDIR /tmp COPY Gemfile /tmp/ COPY Gemfile.lock /tmp/ -RUN bundle install +RUN bundle install --binstubs # Clean up APT when done. #RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/docker/env.example b/docker/env.example index 7889c44ed..f8d7e6186 100644 --- a/docker/env.example +++ b/docker/env.example @@ -6,7 +6,7 @@ SECRET_KEY_BASE= STRIPE_API_KEY= STRIPE_PUBLISHABLE_KEY= -STRIPE_CURRENCY= +STRIPE_CURRENCY=eur INVOICE_PREFIX=Demo-FabLab-facture FABLAB_WITHOUT_PLANS=false @@ -16,9 +16,9 @@ DEFAULT_HOST=demo.fab-manager.com DEFAULT_PROTOCOL=http DELIVERY_METHOD=smtp -SMTP_ADDRESS=smtp.sparkpostmail.com +SMTP_ADDRESS=smtp.mailgun.org SMTP_PORT=587 -SMTP_USER_NAME=SMTP_Injection +SMTP_USER_NAME= SMTP_PASSWORD= GA_ID= @@ -42,4 +42,5 @@ ELASTICSEARCH_LANGUAGE_ANALYZER=french TIME_ZONE=Paris WEEK_STARTING_DAY=monday -D3_DATE_FORMAT=%d/%m/%y \ No newline at end of file +D3_DATE_FORMAT=%d/%m/%y +UIB_DATE_FORMAT=dd/MM/yyyy \ No newline at end of file