Sutty/lumi-api
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pasar la master key

Browse source
This commit is contained in:
fauno 2019-04-06 18:35:44 -03:00
parent ed987ade19
commit 6b345bded9
No known key found for this signature in database
GPG key ID: 456032D717A4CD9C
4 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.dockerignore
View file

@ -16,3 +16,4 @@ monit.conf
README.md README.md
TODO* TODO*
web@.service web@.service
data/

1
.gitignore vendored
View file

@ -30,3 +30,4 @@
/public/docs/ /public/docs/
/.yardoc/ /.yardoc/
/docs/ /docs/
/data/

3
Dockerfile
View file

@ -50,7 +50,8 @@ COPY --from=build --chown=app:www-data /home/app/web/.bundle ./.bundle
COPY --chown=app:www-data ./docs ./public/docs COPY --chown=app:www-data ./docs ./public/docs
USER root USER root
ENV RAILS_MASTER_KEY ARG MASTER_KEY
ENV RAILS_MASTER_KEY=$MASTER_KEY
ENV RAILS_ENV production ENV RAILS_ENV production
RUN install -m 640 -o root -g root ./monit.conf /etc/monit.d/puma.conf RUN install -m 640 -o root -g root ./monit.conf /etc/monit.d/puma.conf
RUN monit -t RUN monit -t

4
Makefile
View file

@ -5,6 +5,8 @@ c ?= $(shell date +%F | tr "-" ".")
r ?= $(shell git rev-list --count HEAD) r ?= $(shell git rev-list --count HEAD)
name = miniloom/$(d):$(c).$(r) name = miniloom/$(d):$(c).$(r)
master_key := $(shell cat config/master.key)
doc: doc:
./bin/yardoc --output-dir=./docs/ \ ./bin/yardoc --output-dir=./docs/ \
app/controllers/*.rb \ app/controllers/*.rb \
@ -15,7 +17,7 @@ clean:
rm -rf tmp/cache/assets rm -rf tmp/cache/assets
build: build:
docker build -t $(name) . docker build --build-arg MASTER_KEY=$(master_key) -t $(name) .
tag: tag:
git tag $(c).$(r) git tag $(c).$(r)