This repository has been archived on 2023-10-28. You can view files and clone it, but cannot push or open issues or pull requests.
pwt-0x01-ng/Makefile

99 lines
2.6 KiB
Makefile
Raw Normal View History

dtag = netcoreultimapp
dtagdev = netcoreultimapp-dev
dfile = Dockerfile
dfiledev = $(dfile).dev
lport = 8000
lportdev = 8001
CC = dotnet
2020-12-02 03:31:56 +01:00
dcmd = docker
pruneargs = system prune -af
dcmdrun = $(dcmd) run --rm
merge: bring in kaniko builds commit 3a155798a9eaaed942c5d6ca1a8524977f721b94 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit 3f775a110b23cb0f23ada04c48fd3e9b0b505129 Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit 42c6dfd3bae4087a0611bed972081802b1349868 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit 1cc3df6619588bc698109e83f102e4b1f724c15e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commit befe7880fc5aa3730402a1ab2c3ad0488a7e1383 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit 15d7de19964cd982795cd8fc6626d18fa234da04 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit 5ed341f4aee1a32f96f5c0f37fabf61f272c5699 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit 732cd7d7172c8c6427c0c414908ca5e92a54b2c0 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit 11a9ab07ab0e9a613ee781a04e5279f012534e56 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commit a5814573260b13f37bf6bc1b19f80021c6806327 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit 1ef9a6831f1820be851a65eede006fddcf7116d7 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit 11d796f0dd9d5267c56ca7151a8ef2edbf5cbf03 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit 4b58c3f584d99b46386e54f5dbdf3764439df521 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit 63601f7f47f05abf40669675c09fab5343522f9a Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit 54fb45ec657dfbbc308b17c25c22d63e41e16f18 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert 907a470 and 63bde0a commit eece1e3dbacddf89a7729b730784c07511afa4ba Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit 907a4702d893e7f756e94bc24414a4c7e301d96e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
2020-12-02 03:09:34 +01:00
wdir = /src
2020-12-02 03:31:56 +01:00
kanikoimg = gcr.io/kaniko-project/executor
dargskaniko = -w=$(wdir) -v $$(pwd):$(wdir):z $(kanikoimg)
2020-12-02 03:31:56 +01:00
kanikoargs = -c=$(wdir) --use-new-run --snapshotMode=redo --no-push
krelease = $(dcmdrun) $(dargskaniko) -f=$(dfile) $(kanikoargs)
kdebug = $(dcmdrun) $(dargskaniko) -f=$(dfiledev) $(kanikoargs)
merge: feature-add-identity commit 47c8a3e8e27fb8a71e702232c681d588fa152bc0 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:58:07 2021 +0100 chore: register and login on the right commit 3e32cd61c2436123887d78f4ae396577b378e53c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:43:07 2021 +0100 chore: add {Login,Register}ViewModel commit f82f12a5328f1500c3a58dccb3728dc86d1cc92c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:30:36 2021 +0100 chore: libs and pkgs version bump commit 202b06505c94817c7bc60b432a9320efce80afac Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:40 2021 +0100 chore: local post-kaniko convenience chown * [skip ci] commit 7e4c4ccbbf4f7290d47c4c682f09ee508b34ae1e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:15 2021 +0100 chore: add Manager on app start commit 62e9d567c07794b821eb86e7dcff4ecbb6bbd47e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:12:24 2021 +0100 chore: add Login page * include FontAwesome (atm from CDN, will fetch it later and bundle it here) commit 3c899a2d024d8b74c7e28dfd4b86e1332d964129 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 13:33:32 2021 +0100 fix: use proper service provider commit 88a6e0f45eae7d71cf352d01a693429246effd98 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 12:26:41 2021 +0100 chore: do creation async + s/FirstName/Name/ commit eaed0ec13c0dd3824802a698ac9ed30bffc52de9 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 10:55:23 2021 +0100 fix: err creating admin * cause of silly passwd requirements - require {upper,lower}case and non-alphanumeric characters is implicitly set to true commit f55f8517f8f8516192b5d156c71596e7fcc55ad2 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 23:11:06 2021 +0100 feat: table renames+call role-creating methods * no "AspNet" prefix * actually call Ensure{Admin,Roles}Created on app start commit 20d3458f281ec9478dc9b0fab3795556dcd0a78f Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 22:05:11 2021 +0100 fix typo: DbContext --> DBContext commit f972ac83e7197813bf4c9b4d9bb44d640b5dd071 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 20:55:22 2021 +0100 chore: add login and usr mgmt logic * add login and registration views * add methods to create admin user on app start commit b65a6d21f8dc5227a8da2d5040348e269c2f3711 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 16:02:33 2021 +0100 chore: add auth options * FIXME dev fun settings need to be replaced with proper settings commit 8f84939c22ec96e0a143350b9b9ba3d738dfc149 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 14:54:57 2021 +0100 chore: adding identity roles (batch 1) * preparing Startup and DBContext to work with roles and auth * added Roles enum * added User model * added Microsoft.AspNetCore.Identity.EntityFrameworkCore v3.1.10 nuget * note: auth is not ready and working yet, this is batch one of the preparations
2021-01-28 15:27:25 +01:00
postkanikochown = sudo chown -R $$USER:$$USER ./
merge: bring in feature-netcore-scaffolding-pain commit 34664fc9f3876605001b4c5294d3350a136f2997 Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:18:05 2020 +0100 chore: edit the scaffolded views to use our layout commit 6816006c09b5a3d79c489e3c27d7081b83e6195e Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:14:17 2020 +0100 chore: update Makefile "run" target+added targets * pgdba - start a dev db container in background * pgdbz - stop the dev db image * docker run db img args are configured via variables as seen fit * run is now more of a "watch run" commit f1d87345ac2d7d9ce854a6c8bb37731ff0f8805c Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:12:41 2020 +0100 chore: add {OrderItem,Order} links to navbar commit c214cf4fe6625ad312275432a8883a01e37f9cf0 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 30 13:37:34 2020 +0100 chore: add netcore-scaffolded controllers+views * Templates folder of the vs.web.codegenerators pkg (v3.1.4) had to be temporarily copied to the project directory for the scaffolding to work; unnecessary template folders had to be removed prior to running scaffold command * restored pkgs and clean built, then scaffolded using (var set for trace output of the command): make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrdersController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.Order -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrderItemController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.OrderItem -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build
2020-12-31 02:01:45 +01:00
pgdbcapdrop = --cap-drop NET_ADMIN --cap-drop SYS_ADMIN
pgdbenv = -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=679968312e029a806c1905c40ec331aa199a1eb86bd0b9eb04057933e449bdc9ef8ef292a39b68cafa5689c901a17266 -e POSTGRES_INITDB_ARGS="--data-checksums"
pgdbname = pgdb
pgdbports = -p 127.0.0.1:5433:5432
pgdbvol = -v pgdbdata:/var/lib/postgresql/data
pgdbargs = run -d $(pgdbcapdrop) $(pgdbenv) --name $(pgdbname) $(pgdbports) $(pgdbvol) --restart unless-stopped
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 dcdevb dcdevup
dev: restore build run
2020-11-26 00:25:03 +01:00
restore:
$(CC) restore
2020-11-26 00:25:03 +01:00
build:
$(CC) build .
2020-11-26 00:25:03 +01:00
run:
merge: bring in feature-netcore-scaffolding-pain commit 34664fc9f3876605001b4c5294d3350a136f2997 Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:18:05 2020 +0100 chore: edit the scaffolded views to use our layout commit 6816006c09b5a3d79c489e3c27d7081b83e6195e Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:14:17 2020 +0100 chore: update Makefile "run" target+added targets * pgdba - start a dev db container in background * pgdbz - stop the dev db image * docker run db img args are configured via variables as seen fit * run is now more of a "watch run" commit f1d87345ac2d7d9ce854a6c8bb37731ff0f8805c Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:12:41 2020 +0100 chore: add {OrderItem,Order} links to navbar commit c214cf4fe6625ad312275432a8883a01e37f9cf0 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 30 13:37:34 2020 +0100 chore: add netcore-scaffolded controllers+views * Templates folder of the vs.web.codegenerators pkg (v3.1.4) had to be temporarily copied to the project directory for the scaffolding to work; unnecessary template folders had to be removed prior to running scaffold command * restored pkgs and clean built, then scaffolded using (var set for trace output of the command): make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrdersController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.Order -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrderItemController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.OrderItem -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build
2020-12-31 02:01:45 +01:00
$(zenv) $(CC) watch run .
2020-11-26 00:25:03 +01:00
merge: bring in kaniko builds commit 3a155798a9eaaed942c5d6ca1a8524977f721b94 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit 3f775a110b23cb0f23ada04c48fd3e9b0b505129 Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit 42c6dfd3bae4087a0611bed972081802b1349868 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit 1cc3df6619588bc698109e83f102e4b1f724c15e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commit befe7880fc5aa3730402a1ab2c3ad0488a7e1383 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit 15d7de19964cd982795cd8fc6626d18fa234da04 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit 5ed341f4aee1a32f96f5c0f37fabf61f272c5699 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit 732cd7d7172c8c6427c0c414908ca5e92a54b2c0 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit 11a9ab07ab0e9a613ee781a04e5279f012534e56 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commit a5814573260b13f37bf6bc1b19f80021c6806327 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit 1ef9a6831f1820be851a65eede006fddcf7116d7 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit 11d796f0dd9d5267c56ca7151a8ef2edbf5cbf03 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit 4b58c3f584d99b46386e54f5dbdf3764439df521 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit 63601f7f47f05abf40669675c09fab5343522f9a Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit 54fb45ec657dfbbc308b17c25c22d63e41e16f18 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert 907a470 and 63bde0a commit eece1e3dbacddf89a7729b730784c07511afa4ba Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit 907a4702d893e7f756e94bc24414a4c7e301d96e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
2020-12-02 03:09:34 +01:00
releasebuild: restore clean
$(CC) publish -c Release
2020-11-26 00:25:03 +01:00
dockerbuild:
2020-12-02 03:13:19 +01:00
docker build \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-t $(dtag) -f $(dfile) --no-cache .
dockerdevbuild:
2020-12-02 03:13:19 +01:00
docker build \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-t $(dtagdev) -f $(dfiledev) --no-cache .
2020-11-26 00:25:03 +01:00
dockerrun:
@echo ======================
@echo local port: $(lport)
@echo ======================
$(dcmdrun) -p $(lport):80 $(dtag)
dockerdevrun:
@echo ======================
@echo local dev port: $(lportdev)
@echo ======================
$(dcmdrun) -p $(lportdev):5000 $(dtagdev)
2020-11-26 00:25:03 +01:00
dcdevb:
docker-compose build --no-cache --pull --progress tty
dcdevup:
@echo ======================
@echo local dev port: $(lportdev)
@echo ======================
docker-compose up --remove-orphans
merge: bring in kaniko builds commit 3a155798a9eaaed942c5d6ca1a8524977f721b94 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit 3f775a110b23cb0f23ada04c48fd3e9b0b505129 Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit 42c6dfd3bae4087a0611bed972081802b1349868 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit 1cc3df6619588bc698109e83f102e4b1f724c15e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commit befe7880fc5aa3730402a1ab2c3ad0488a7e1383 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit 15d7de19964cd982795cd8fc6626d18fa234da04 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit 5ed341f4aee1a32f96f5c0f37fabf61f272c5699 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit 732cd7d7172c8c6427c0c414908ca5e92a54b2c0 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit 11a9ab07ab0e9a613ee781a04e5279f012534e56 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commit a5814573260b13f37bf6bc1b19f80021c6806327 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit 1ef9a6831f1820be851a65eede006fddcf7116d7 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit 11d796f0dd9d5267c56ca7151a8ef2edbf5cbf03 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit 4b58c3f584d99b46386e54f5dbdf3764439df521 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit 63601f7f47f05abf40669675c09fab5343522f9a Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit 54fb45ec657dfbbc308b17c25c22d63e41e16f18 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert 907a470 and 63bde0a commit eece1e3dbacddf89a7729b730784c07511afa4ba Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit 907a4702d893e7f756e94bc24414a4c7e301d96e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
2020-12-02 03:09:34 +01:00
kaniko:
$(krelease)
merge: feature-add-identity commit 47c8a3e8e27fb8a71e702232c681d588fa152bc0 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:58:07 2021 +0100 chore: register and login on the right commit 3e32cd61c2436123887d78f4ae396577b378e53c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:43:07 2021 +0100 chore: add {Login,Register}ViewModel commit f82f12a5328f1500c3a58dccb3728dc86d1cc92c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:30:36 2021 +0100 chore: libs and pkgs version bump commit 202b06505c94817c7bc60b432a9320efce80afac Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:40 2021 +0100 chore: local post-kaniko convenience chown * [skip ci] commit 7e4c4ccbbf4f7290d47c4c682f09ee508b34ae1e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:15 2021 +0100 chore: add Manager on app start commit 62e9d567c07794b821eb86e7dcff4ecbb6bbd47e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:12:24 2021 +0100 chore: add Login page * include FontAwesome (atm from CDN, will fetch it later and bundle it here) commit 3c899a2d024d8b74c7e28dfd4b86e1332d964129 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 13:33:32 2021 +0100 fix: use proper service provider commit 88a6e0f45eae7d71cf352d01a693429246effd98 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 12:26:41 2021 +0100 chore: do creation async + s/FirstName/Name/ commit eaed0ec13c0dd3824802a698ac9ed30bffc52de9 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 10:55:23 2021 +0100 fix: err creating admin * cause of silly passwd requirements - require {upper,lower}case and non-alphanumeric characters is implicitly set to true commit f55f8517f8f8516192b5d156c71596e7fcc55ad2 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 23:11:06 2021 +0100 feat: table renames+call role-creating methods * no "AspNet" prefix * actually call Ensure{Admin,Roles}Created on app start commit 20d3458f281ec9478dc9b0fab3795556dcd0a78f Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 22:05:11 2021 +0100 fix typo: DbContext --> DBContext commit f972ac83e7197813bf4c9b4d9bb44d640b5dd071 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 20:55:22 2021 +0100 chore: add login and usr mgmt logic * add login and registration views * add methods to create admin user on app start commit b65a6d21f8dc5227a8da2d5040348e269c2f3711 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 16:02:33 2021 +0100 chore: add auth options * FIXME dev fun settings need to be replaced with proper settings commit 8f84939c22ec96e0a143350b9b9ba3d738dfc149 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 14:54:57 2021 +0100 chore: adding identity roles (batch 1) * preparing Startup and DBContext to work with roles and auth * added Roles enum * added User model * added Microsoft.AspNetCore.Identity.EntityFrameworkCore v3.1.10 nuget * note: auth is not ready and working yet, this is batch one of the preparations
2021-01-28 15:27:25 +01:00
$(postkanikochown)
merge: bring in kaniko builds commit 3a155798a9eaaed942c5d6ca1a8524977f721b94 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit 3f775a110b23cb0f23ada04c48fd3e9b0b505129 Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit 42c6dfd3bae4087a0611bed972081802b1349868 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit 1cc3df6619588bc698109e83f102e4b1f724c15e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commit befe7880fc5aa3730402a1ab2c3ad0488a7e1383 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit 15d7de19964cd982795cd8fc6626d18fa234da04 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit 5ed341f4aee1a32f96f5c0f37fabf61f272c5699 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit 732cd7d7172c8c6427c0c414908ca5e92a54b2c0 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit 11a9ab07ab0e9a613ee781a04e5279f012534e56 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commit a5814573260b13f37bf6bc1b19f80021c6806327 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit 1ef9a6831f1820be851a65eede006fddcf7116d7 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit 11d796f0dd9d5267c56ca7151a8ef2edbf5cbf03 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit 4b58c3f584d99b46386e54f5dbdf3764439df521 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit 63601f7f47f05abf40669675c09fab5343522f9a Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit 54fb45ec657dfbbc308b17c25c22d63e41e16f18 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert 907a470 and 63bde0a commit eece1e3dbacddf89a7729b730784c07511afa4ba Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit 907a4702d893e7f756e94bc24414a4c7e301d96e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
2020-12-02 03:09:34 +01:00
$(kdebug)
merge: feature-add-identity commit 47c8a3e8e27fb8a71e702232c681d588fa152bc0 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:58:07 2021 +0100 chore: register and login on the right commit 3e32cd61c2436123887d78f4ae396577b378e53c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:43:07 2021 +0100 chore: add {Login,Register}ViewModel commit f82f12a5328f1500c3a58dccb3728dc86d1cc92c Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:30:36 2021 +0100 chore: libs and pkgs version bump commit 202b06505c94817c7bc60b432a9320efce80afac Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:40 2021 +0100 chore: local post-kaniko convenience chown * [skip ci] commit 7e4c4ccbbf4f7290d47c4c682f09ee508b34ae1e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:29:15 2021 +0100 chore: add Manager on app start commit 62e9d567c07794b821eb86e7dcff4ecbb6bbd47e Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 14:12:24 2021 +0100 chore: add Login page * include FontAwesome (atm from CDN, will fetch it later and bundle it here) commit 3c899a2d024d8b74c7e28dfd4b86e1332d964129 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 13:33:32 2021 +0100 fix: use proper service provider commit 88a6e0f45eae7d71cf352d01a693429246effd98 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 12:26:41 2021 +0100 chore: do creation async + s/FirstName/Name/ commit eaed0ec13c0dd3824802a698ac9ed30bffc52de9 Author: surtur <a_mirre@utb.cz> Date: Thu Jan 28 10:55:23 2021 +0100 fix: err creating admin * cause of silly passwd requirements - require {upper,lower}case and non-alphanumeric characters is implicitly set to true commit f55f8517f8f8516192b5d156c71596e7fcc55ad2 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 23:11:06 2021 +0100 feat: table renames+call role-creating methods * no "AspNet" prefix * actually call Ensure{Admin,Roles}Created on app start commit 20d3458f281ec9478dc9b0fab3795556dcd0a78f Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 22:05:11 2021 +0100 fix typo: DbContext --> DBContext commit f972ac83e7197813bf4c9b4d9bb44d640b5dd071 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 20:55:22 2021 +0100 chore: add login and usr mgmt logic * add login and registration views * add methods to create admin user on app start commit b65a6d21f8dc5227a8da2d5040348e269c2f3711 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 16:02:33 2021 +0100 chore: add auth options * FIXME dev fun settings need to be replaced with proper settings commit 8f84939c22ec96e0a143350b9b9ba3d738dfc149 Author: surtur <a_mirre@utb.cz> Date: Wed Jan 27 14:54:57 2021 +0100 chore: adding identity roles (batch 1) * preparing Startup and DBContext to work with roles and auth * added Roles enum * added User model * added Microsoft.AspNetCore.Identity.EntityFrameworkCore v3.1.10 nuget * note: auth is not ready and working yet, this is batch one of the preparations
2021-01-28 15:27:25 +01:00
$(postkanikochown)
merge: bring in kaniko builds commit 3a155798a9eaaed942c5d6ca1a8524977f721b94 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 2 03:08:12 2020 +0100 rm: get rid of unused launch settings [skip ci] commit 3f775a110b23cb0f23ada04c48fd3e9b0b505129 Author: surtur <a_mirre@utb.cz> Date: Sun Nov 29 21:08:11 2020 +0100 fix: clean build after restore * this fixes occasional situation when NuGets have not been restored yet but the clean build already running required them, which resulted a failed build commit 42c6dfd3bae4087a0611bed972081802b1349868 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 20:05:30 2020 +0100 chore: update make kaniko * skip ci commit 1cc3df6619588bc698109e83f102e4b1f724c15e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:48 2020 +0100 chore: rm debug ls call skip ci commit befe7880fc5aa3730402a1ab2c3ad0488a7e1383 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:27 2020 +0100 revert: set kaniko context back to "." skip ci commit 15d7de19964cd982795cd8fc6626d18fa234da04 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 18:58:06 2020 +0100 chore: add make kaniko * skip ci commit 5ed341f4aee1a32f96f5c0f37fabf61f272c5699 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:13:27 2020 +0100 refactor: merge pipelines back commit 732cd7d7172c8c6427c0c414908ca5e92a54b2c0 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:12:39 2020 +0100 chore: don't wait and build commit 11a9ab07ab0e9a613ee781a04e5279f012534e56 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 17:11:08 2020 +0100 revert: kaniko don't give a **** about relpaths commit a5814573260b13f37bf6bc1b19f80021c6806327 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 16:23:28 2020 +0100 debug: see where we are commit 1ef9a6831f1820be851a65eede006fddcf7116d7 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:58:50 2020 +0100 chore: try /src workspace for kaniko commit 11d796f0dd9d5267c56ca7151a8ef2edbf5cbf03 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:30:21 2020 +0100 chore: add /src context for kaniko commit 4b58c3f584d99b46386e54f5dbdf3764439df521 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:22:18 2020 +0100 fix: rel paths are nicer to kaniko commit 63601f7f47f05abf40669675c09fab5343522f9a Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:16:57 2020 +0100 chore: run wherever commit 54fb45ec657dfbbc308b17c25c22d63e41e16f18 Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 15:06:42 2020 +0100 refactor: effectively revert 907a470 and 63bde0a commit eece1e3dbacddf89a7729b730784c07511afa4ba Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:52:23 2020 +0100 chore: move dockerbuilds to a separate pipeline * and run them on the main runner commit 907a4702d893e7f756e94bc24414a4c7e301d96e Author: surtur <a_mirre@utb.cz> Date: Fri Nov 27 14:47:03 2020 +0100 chore: give kaniko relative paths in Dockerfile
2020-12-02 03:09:34 +01:00
dockerdev: dockerdevbuild dockerdevrun
2020-11-26 00:25:03 +01:00
dockertest: dockerdevbuild dockerbuild
test: releasebuild build dockertest kaniko
2020-11-26 00:25:03 +01:00
clean:
$(CC) clean
prune:
$(dcmd) $(pruneargs)
merge: bring in feature-netcore-scaffolding-pain commit 34664fc9f3876605001b4c5294d3350a136f2997 Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:18:05 2020 +0100 chore: edit the scaffolded views to use our layout commit 6816006c09b5a3d79c489e3c27d7081b83e6195e Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:14:17 2020 +0100 chore: update Makefile "run" target+added targets * pgdba - start a dev db container in background * pgdbz - stop the dev db image * docker run db img args are configured via variables as seen fit * run is now more of a "watch run" commit f1d87345ac2d7d9ce854a6c8bb37731ff0f8805c Author: surtur <a_mirre@utb.cz> Date: Thu Dec 31 01:12:41 2020 +0100 chore: add {OrderItem,Order} links to navbar commit c214cf4fe6625ad312275432a8883a01e37f9cf0 Author: surtur <a_mirre@utb.cz> Date: Wed Dec 30 13:37:34 2020 +0100 chore: add netcore-scaffolded controllers+views * Templates folder of the vs.web.codegenerators pkg (v3.1.4) had to be temporarily copied to the project directory for the scaffolding to work; unnecessary template folders had to be removed prior to running scaffold command * restored pkgs and clean built, then scaffolded using (var set for trace output of the command): make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrdersController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.Order -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build make restore clean build; codegen_trace=1 dotnet-aspnet-codegenerator controller -p "." -actions --force -name OrderItemController -dc pwt_0x01_ng.Models.Database.DBContext -async -m pwt_0x01_ng.Models.OrderItem -namespace pwt_0x01_ng.Areas.Admin.Controllers -outDir Areas/Admin/Controllers --no-build
2020-12-31 02:01:45 +01:00
pgdba:
$(dcmd) $(pgdbargs) $(pgdbimg)
pgdbz:
$(dcmd) stop $(pgdbname)