Skip to content

Commit 994a45a

Browse files
raivisdejusIlja Lapkovskis
authored andcommitted
Adding auto-restarting frontend container on changes and some make commands to work with core files (#35)
1 parent dc0068a commit 994a45a

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

Makefile

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Define available commands
22
.PHONY: build full-rebuild push up recreate down cert pull \
3-
down-rm-volumes applogs logs flushall
3+
down-rm-volumes applogs logs flushall core-up core-down core-logs \
4+
exec
45

56
# Variables
67
current_dir := $(shell pwd)
@@ -11,6 +12,9 @@ gid := $(shell id -g)
1112
up:
1213
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml up -d
1314

15+
core-up:
16+
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.core.yml -f docker-compose.ssl.yml up -d
17+
1418
build:
1519
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml build
1620

@@ -20,6 +24,9 @@ pull:
2024
down:
2125
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml down --remove-orphans
2226

27+
core-down:
28+
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.core.yml -f docker-compose.ssl.yml down --remove-orphans
29+
2330
down-rm-volumes:
2431
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml down -v
2532

@@ -29,13 +36,22 @@ applogs:
2936
logs:
3037
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml logs -f
3138

39+
core-logs:
40+
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.core.yml -f docker-compose.ssl.yml logs -f --tail 100
41+
3242
full-rebuild:
3343
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.ssl.yml build --pull --no-cache
3444

3545
flushall:
3646
docker-compose -f docker-compose.yml -f docker-compose.local.yml exec varnish varnishadm "ban req.url ~ /"
3747
docker-compose -f docker-compose.yml -f docker-compose.local.yml exec redis redis-cli FLUSHALL
3848

49+
exec:
50+
docker-compose -f docker-compose.yml -f docker-compose.local.yml -f docker-compose.core.yml -f docker-compose.ssl.yml exec -u user app $(filter-out $@,$(MAKECMDGOALS))
51+
52+
%:
53+
@true
54+
3955
cert:
4056
mkdir -p opt/cert
4157
docker run -it --rm --init \

build/frontend/start-core.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/bash
22
npm ci
3-
npm run watch-core
3+
npm install pm2 forever -g
4+
pm2-runtime process-core.yml

build/frontend/start.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/bin/bash
22
npm ci
3-
npm run watch
3+
npm install pm2 forever -g
4+
pm2-runtime process.yml

0 commit comments

Comments
 (0)