rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-29 18:52:22 +01:00
Code Issues Releases Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Sylvain 2016-04-11 11:41:46 +02:00
commit 01ca290582
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ruby:2.2 FROM ruby:2.3
MAINTAINER peng@sleede.com MAINTAINER peng@sleede.com
# cf: nginx Dockerfile : https://github.com/nginxinc/docker-nginx # cf: nginx Dockerfile : https://github.com/nginxinc/docker-nginx
@ -23,7 +23,7 @@ RUN bundle config --global frozen 1
WORKDIR /tmp WORKDIR /tmp
COPY Gemfile /tmp/ COPY Gemfile /tmp/
COPY Gemfile.lock /tmp/ COPY Gemfile.lock /tmp/
RUN bundle install RUN bundle install --binstubs
# Clean up APT when done. # Clean up APT when done.
#RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* #RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

7
docker/env.example
View File

@ -6,7 +6,7 @@ SECRET_KEY_BASE=
STRIPE_API_KEY= STRIPE_API_KEY=
STRIPE_PUBLISHABLE_KEY= STRIPE_PUBLISHABLE_KEY=
STRIPE_CURRENCY= STRIPE_CURRENCY=eur
INVOICE_PREFIX=Demo-FabLab-facture INVOICE_PREFIX=Demo-FabLab-facture
FABLAB_WITHOUT_PLANS=false FABLAB_WITHOUT_PLANS=false
@ -16,9 +16,9 @@ DEFAULT_HOST=demo.fab-manager.com
DEFAULT_PROTOCOL=http DEFAULT_PROTOCOL=http
DELIVERY_METHOD=smtp DELIVERY_METHOD=smtp
SMTP_ADDRESS=smtp.sparkpostmail.com SMTP_ADDRESS=smtp.mailgun.org
SMTP_PORT=587 SMTP_PORT=587
SMTP_USER_NAME=SMTP_Injection SMTP_USER_NAME=
SMTP_PASSWORD= SMTP_PASSWORD=
GA_ID= GA_ID=
@ -43,3 +43,4 @@ ELASTICSEARCH_LANGUAGE_ANALYZER=french
TIME_ZONE=Paris TIME_ZONE=Paris
WEEK_STARTING_DAY=monday WEEK_STARTING_DAY=monday
D3_DATE_FORMAT=%d/%m/%y D3_DATE_FORMAT=%d/%m/%y
UIB_DATE_FORMAT=dd/MM/yyyy