Compare commits
2 Commits
1212d20401
...
a376ef9487
| Author | SHA1 | Date | |
|---|---|---|---|
| a376ef9487 | |||
| 9e8057f6e7 |
7
Makefile
7
Makefile
@ -241,8 +241,9 @@ db: --image-build --containerized---db;
|
||||
# --containerized-%-memcached: --image-build
|
||||
# $(MAKE) -- --image-run-$*-memcached
|
||||
--containerized---start-memcached:
|
||||
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" &
|
||||
CONTAINER_ID=`$(CONTAINER_BGRUN) $(MEMCACHED_IMAGE)` ; \
|
||||
MEMCACHED_PORT=`cat $(CONTAINER_FILE) | grep 'MEMCACHED_PORT=' | sed 's/MEMCACHED_PORT=//'`; \
|
||||
./utils/watchcontainerrun.sh "$(CONTAINER_COMMAND)" "$(CONTAINER_FILE)" & \
|
||||
CONTAINER_ID=`$(CONTAINER_BGRUN) $(MEMCACHED_IMAGE) --port=$${MEMCACHED_PORT}` ; \
|
||||
echo "CONTAINER_ID=$${CONTAINER_ID}" >> $(CONTAINER_FILE)
|
||||
|
||||
--containerized-%-database: FRADRIVE_SERVICE=database
|
||||
@ -332,7 +333,7 @@ start-%: --develop
|
||||
echo "DEV $(DEVELOP)"
|
||||
if [[ "$(SINGLETON)" = "true" ]]; then \
|
||||
CONTAINER_FILE=$(DEVELOP)/$* ; \
|
||||
if ! [[ -e $${CONTAINER_FILE} ]]; then \
|
||||
if [[ -e $${CONTAINER_FILE} ]]; then \
|
||||
>&2 echo "Another $* service is already running! Use \"make new-develop\" or \"make start\" to start a new develop instance despite currently running services." ; \
|
||||
exit 1 ; \
|
||||
fi \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user