Skip to content

Commit cbad380

Browse files
committed
Added start_all make command, updated README
1 parent 6454ef8 commit cbad380

File tree

2 files changed

+41
-11
lines changed

2 files changed

+41
-11
lines changed

Makefile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ DOCKER_EXEC_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose
33
DOCKER_EXEC_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec vue")
44
DOCKER_EXEC_WWW=$(shell command -v docker > /dev/null && echo "docker-compose exec www")
55

6+
DOCKER_CRON_VUE=$(shell command -v docker > /dev/null && echo "docker-compose exec -T vue")
7+
DOCKER_CRON_DJANGO=$(shell command -v docker > /dev/null && echo "docker-compose exec -T django")
8+
9+
610
.PHONY: tests
711

812
init:
@@ -12,10 +16,17 @@ init:
1216
up:
1317
docker-compose up -d
1418

19+
down: stop
20+
21+
stop:
22+
docker-compose stop
23+
1524
build_docker:
1625
cd django && make build_docker
1726
cd vue && make build_docker
1827

28+
build: build_docker
29+
1930
push:
2031
cd django && make push
2132
cd vue && make push
@@ -29,6 +40,11 @@ enter_vue:
2940
enter_www:
3041
$(DOCKER_EXEC_WWW) ash
3142

43+
start_all: up
44+
$(DOCKER_CRON_VUE) make &
45+
$(DOCKER_CRON_DJANGO) make &
46+
$(DOCKER_CRON_VUE) make screenshotservice &
47+
3248
start_vue:
3349
$(DOCKER_EXEC_VUE) make
3450

README.md

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1-
# Gemeindescan Web UI
1+
# Gemeindescan Web
22

3-
Web application under heavy development. For more information, please visit https://cividi.ch
3+
A web application for publishing and collaborating around urban planning projects. This project is part of the [Cividi](https://cividi.ch) solution for holistic urban assessments, used as a tool for setting planning priorities.
44

5-
The current tech stack of this project is:
5+
For more information, please visit https://gemeindescan.ch or read our [whitepaper](https://bitbucket.org/cividi/whitepaper).
6+
7+
# Releases
8+
9+
*See [RELEASE.md](/RELEASE.md)*
10+
11+
# Developer guide
12+
13+
:construction: The current tech stack of this project is:
614

715
- Vuetify
816
- Vue.js
@@ -12,14 +20,6 @@ The current tech stack of this project is:
1220
- Wagtail
1321
- Docker
1422

15-
# Releases
16-
17-
*See [RELEASE.md](/RELEASE.md)*
18-
19-
# Developer guide
20-
21-
:construction:
22-
2323
For a tour of the app and a testing protocol see [`docs/testing.md`](/docs/testing.md).
2424

2525
## setup project
@@ -76,6 +76,14 @@ GraphQLi: http://www:8000/graphql
7676

7777
**start services**
7878

79+
Start all the services at the same time using
80+
81+
```bash
82+
make start_all
83+
```
84+
85+
or individually using:
86+
7987
```bash
8088
# 1. shell
8189
make start_vue
@@ -87,6 +95,12 @@ make start_screenshotservice
8795

8896
You can also start the vue / django service from the vscode shell (see editor).
8997

98+
**stop services**
99+
100+
```bash
101+
make stop
102+
```
103+
90104
### tests
91105

92106
```bash

0 commit comments

Comments
 (0)