From 0741deaff9eab49aad28b4bcbfa915185fc89c64 Mon Sep 17 00:00:00 2001
From: surtur <a_mirre@utb.cz>
Date: Sat, 23 Jan 2021 14:25:24 +0100
Subject: [PATCH] chore: change compose targets

* update Makefile and README
* [skip ci]
---
 Makefile  | 9 ++++++---
 README.md | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 382070a..317749e 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ pgdbargs = run -d $(pgdbcapdrop) $(pgdbenv) --name $(pgdbname) $(pgdbports) $(pg
 pgdbimg = postgres:13.1-alpine
 zenv = DB_CONNECTION_STRING=$$(cat appsettings.Development.json | jq .db.Postgres | sed -e 's/5432/5433/' -e 's/=db/=localhost/' -e 's/"//g')
 
-.PHONY: dev dockerbuild dockerdevbuild dockerrun dockerdevrun dockertest dockerdev kaniko clean prune pgdba pgdbz test
+.PHONY: dev dockerbuild dockerdevbuild dockerrun dockerdevrun dockertest dockerdev kaniko clean prune pgdba pgdbz test dcdevb dcdevup
 
 dev: restore build run
 
@@ -63,11 +63,14 @@ dockerdevrun:
 	@echo ======================
 	$(dcmdrun) -p $(lportdev):5000 $(dtagdev)
 
-dcdevrun:
+dcdevb:
+	docker-compose build --no-cache --pull --progress tty
+
+dcdevup:
 	@echo ======================
 	@echo local dev port: $(lportdev)
 	@echo ======================
-	docker-compose up --build --remove-orphans
+	docker-compose up --remove-orphans
 
 kaniko:
 	$(krelease)
diff --git a/README.md b/README.md
index eb54838..96710b2 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ this repo holds *sawce* for PWT .netcore mvc project 0x01-ng
 - `clean` --> clean builds the project
 - `build` --> builds the project
 - `dockerdevbuild` --> clean-builds a container image from [[Dockerfile.dev]] (have a look in there for details)
-- `dcdevrun` --> runs compose that builds a debug (dev) version, pulls db and runs it according to [[docker-compose.yml]] together with the just-built image\
-if you need a clean build, run this together with `dockerdevbuild`
+- `dcdevb` --> compose clean build of a debug (dev) version, pulling db
+- `dcdevup` --> runs the above (see [[docker-compose.yml]])
 > you need to have created a db beforehand to run these
 - `run` --> runs `$CURRENT_ENV dotnet watch run .`
 - `dev` --> runs `restore build run` - this is kind of a convenience target