projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install.rb: generate config.yml file on demand if necessary. Refs #2221.
[arvados.git]
/
docker
/
Makefile
diff --git
a/docker/Makefile
b/docker/Makefile
index c6f3dd7d120decd8f83cd7dda8c67e86a3f5fbe0..d949db059e45294a3f4c7f318cff1169dc23d0ac 100644
(file)
--- a/
docker/Makefile
+++ b/
docker/Makefile
@@
-33,7
+33,7
@@
WAREHOUSE_DEPS = warehouse/Dockerfile \
SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
SSO_DEPS = sso/passenger.conf $(SSO_GENERATED)
-BASE_GENERATED = base/generated
+BASE_GENERATED = base/generated
/arvados.tar.gz
API_GENERATED = \
api/generated/apache2_vhost \
API_GENERATED = \
api/generated/apache2_vhost \
@@
-79,6
+79,10
@@
SSO_GENERATED_IN = \
$(BASE_GENERATED): config.yml
./config.rb
$(BASE_GENERATED): config.yml
./config.rb
+ mkdir -p base/generated
+ tar -c -z -f base/generated/arvados.tar.gz -C .. . \
+ --exclude=services/api/log/* --exclude=docker/*
+
$(API_GENERATED): config.yml $(API_GENERATED_IN)
./config.rb
$(API_GENERATED): config.yml $(API_GENERATED_IN)
./config.rb
@@
-102,7
+106,7
@@
DOCKER_BUILD = docker build -q
api-image: passenger-image $(API_DEPS)
mkdir -p api/generated
api-image: passenger-image $(API_DEPS)
mkdir -p api/generated
- tar -c -z -f api/generated/api.tar.gz -C ../services api
+ tar -c -z -f api/generated/api.tar.gz -C ../services api
--exclude=api/log/*
$(DOCKER_BUILD) -t arvados/api api
echo -n "Built at $(date)" > api-image
$(DOCKER_BUILD) -t arvados/api api
echo -n "Built at $(date)" > api-image