Yavook.de/node-fftcg
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

beautification/typo

Browse source
This commit is contained in:
Jörn-Michael Miehe 2019-02-13 17:25:05 +01:00
parent ffb7dd8da6
commit f278d03519
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

@ -1,10 +1,11 @@
COMPOSE:=sudo docker-compose COMPOSE:=sudo docker-compose
CANARY:=node_modules/.yarn-integrity
.PHONY: all .PHONY: all
all: develop all: develop
%/node_modules/.yarn-integrity: %/$(CANARY):
$(eval image:=$(patsubst %/node_modules/.yarn-integrity,%,$@)) $(eval image:=$(patsubst %/$(CANARY),%,$@))
$(COMPOSE) build $(image) $(COMPOSE) build $(image)
$(COMPOSE) run --rm $(image) yarn install --production=false $(COMPOSE) run --rm $(image) yarn install --production=false
@ -12,19 +13,10 @@ DFILES:=$(wildcard */Dockerfile)
IMAGES:=$(patsubst %/Dockerfile,%,$(DFILES)) IMAGES:=$(patsubst %/Dockerfile,%,$(DFILES))
.PHONY: develop .PHONY: develop
develop: $(patsubst %,%/node_modules/.yarn-integrity,$(IMAGES)) develop: $(patsubst %,%/$(CANARY),$(IMAGES))
$(COMPOSE) up $(COMPOSE) up
.PHONY: production .PHONY: production
production: production:
$(COMPOSE) -f docker-compose.yml -f docker-compose.prod.yml build $(COMPOSE) -f docker-compose.yml -f docker-compose.prod.yml build
$(COMPOSE) -f docker-compose.yml -f docker-compose.prod.yml up -d $(COMPOSE) -f docker-compose.yml -f docker-compose.prod.yml up -d
.PHONY: fe-init fe-init-simple
fe-init:
$(COMPOSE) build frontend
$(COMPOSE) run --rm frontend vue init bootstrap-vue/webpack .
fe-init-simple:
$(COMPOSE) build frontend
$(COMPOSE) run --rm frontend vue init bootstrap-vue/webpack-simple .

2
docker-compose.yml
View file

@ -9,4 +9,4 @@ services:
build: build:
context: ./backend context: ./backend
ports: ports:
- "3001:3000" - "3001:3001"