Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

WIP: develop to foodsoft master diff #39

Draft
philipp wants to merge 12 commits from develop into master
pull from: develop
merge into: Foodsoft:master
Conversation 0 Commits 12 Files changed 103 +5 -1
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 82d4ff0284 - Show all commits

6
Dockerfile
View file

@ -15,7 +15,9 @@ ENV PORT=3000 \
WORKDIR /usr/src/app WORKDIR /usr/src/app
COPY . ./ COPY Gemfile Gemfile.lock ./
COPY plugins/ ./plugins
COPY config/ ./config
# install dependencies and generate crontab # install dependencies and generate crontab
RUN buildDeps='libmagic-dev' && \ RUN buildDeps='libmagic-dev' && \
@ -30,6 +32,8 @@ RUN buildDeps='libmagic-dev' && \
\ \
bundle exec whenever >crontab bundle exec whenever >crontab
COPY . ./
# compile assets with temporary mysql server # compile assets with temporary mysql server
RUN export DATABASE_URL=mysql2://localhost/temp?encoding=utf8 && \ RUN export DATABASE_URL=mysql2://localhost/temp?encoding=utf8 && \
export SECRET_KEY_BASE=thisisnotimportantnow && \ export SECRET_KEY_BASE=thisisnotimportantnow && \