pasar la master key
This commit is contained in:
parent
ed987ade19
commit
6b345bded9
4 changed files with 7 additions and 2 deletions
|
@ -16,3 +16,4 @@ monit.conf
|
|||
README.md
|
||||
TODO*
|
||||
web@.service
|
||||
data/
|
||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -30,3 +30,4 @@
|
|||
/public/docs/
|
||||
/.yardoc/
|
||||
/docs/
|
||||
/data/
|
||||
|
|
|
@ -50,7 +50,8 @@ COPY --from=build --chown=app:www-data /home/app/web/.bundle ./.bundle
|
|||
COPY --chown=app:www-data ./docs ./public/docs
|
||||
|
||||
USER root
|
||||
ENV RAILS_MASTER_KEY
|
||||
ARG MASTER_KEY
|
||||
ENV RAILS_MASTER_KEY=$MASTER_KEY
|
||||
ENV RAILS_ENV production
|
||||
RUN install -m 640 -o root -g root ./monit.conf /etc/monit.d/puma.conf
|
||||
RUN monit -t
|
||||
|
|
4
Makefile
4
Makefile
|
@ -5,6 +5,8 @@ c ?= $(shell date +%F | tr "-" ".")
|
|||
r ?= $(shell git rev-list --count HEAD)
|
||||
name = miniloom/$(d):$(c).$(r)
|
||||
|
||||
master_key := $(shell cat config/master.key)
|
||||
|
||||
doc:
|
||||
./bin/yardoc --output-dir=./docs/ \
|
||||
app/controllers/*.rb \
|
||||
|
@ -15,7 +17,7 @@ clean:
|
|||
rm -rf tmp/cache/assets
|
||||
|
||||
build:
|
||||
docker build -t $(name) .
|
||||
docker build --build-arg MASTER_KEY=$(master_key) -t $(name) .
|
||||
|
||||
tag:
|
||||
git tag $(c).$(r)
|
||||
|
|
Loading…
Reference in a new issue