...
|
...
|
@@ -12,6 +12,10 @@ WASM_EXTRA = |
12
|
12
|
endif
|
13
|
13
|
|
14
|
14
|
define msg
|
|
15
|
+ @printf "\033[38;5;197m%s\033[0m" "$(1)"
|
|
16
|
+endef
|
|
17
|
+
|
|
18
|
+define msgnl
|
15
|
19
|
@printf "\033[38;5;197m%s\033[0m\n" "$(1)"
|
16
|
20
|
endef
|
17
|
21
|
|
...
|
...
|
@@ -20,38 +24,62 @@ start: |
20
|
24
|
cargo watch -i static/ -i var/ -s "PROFILE=$(PROFILE) make run"
|
21
|
25
|
|
22
|
26
|
wasm:
|
23
|
|
- $(call msg,BUILD WASM UI)
|
|
27
|
+ $(call msgnl,BUILD WASM UI)
|
24
|
28
|
@PROFILE=$(PROFILE) wasm-pack build $(WASM_PROFILE) -d ../static/ui \
|
25
|
29
|
-t web ./ui -- $(WASM_EXTRA)
|
26
|
30
|
|
27
|
31
|
build:
|
28
|
|
- $(call msg,PATCH DIFFY)
|
29
|
|
- @cargo patch
|
30
|
|
- $(call msg,BUILD SERVER)
|
|
32
|
+ $(call msgnl,PATCH DIFFY)
|
|
33
|
+ @@PROFILE=$(PROFILE) cargo patch
|
|
34
|
+ $(call msgnl,BUILD SERVER)
|
31
|
35
|
@PROFILE=$(PROFILE) cargo build $(CARGO_PROFILE) --bin artshop-server
|
32
|
36
|
|
33
|
37
|
run: build wasm
|
34
|
|
- $(call msg,RUN SERVER)
|
|
38
|
+ $(call msgnl,RUN SERVER)
|
35
|
39
|
@PROFILE=$(PROFILE) cargo run $(CARGO_PROFILE) --bin artshop-server
|
36
|
40
|
|
37
|
41
|
release:
|
38
|
42
|
docker build -t artshop -f build/Dockerfile .
|
39
|
43
|
|
|
44
|
+createdb: downdb devdb
|
|
45
|
+ $(call msg,TRY TO CONNECT TO DB )
|
|
46
|
+ @while true;\
|
|
47
|
+ do\
|
|
48
|
+ echo "SELECT VERSION();"|\
|
|
49
|
+ docker exec -i mariadb-dev \
|
|
50
|
+ mysql -p123456 >/dev/null 2>&1 && break;\
|
|
51
|
+ echo -n ".";\
|
|
52
|
+ sleep 3;\
|
|
53
|
+ done; echo
|
|
54
|
+ $(call msgnl,INITIALIZE APPLICATION DB)
|
|
55
|
+ echo "CREATE DATABASE artshop CHARACTER SET = 'utf8mb3' \
|
|
56
|
+ COLLATE = 'utf8mb3_general_ci'; \
|
|
57
|
+ GRANT ALL PRIVILEGES ON artshop.* TO 'artshop'@'%'"|\
|
|
58
|
+ docker exec -i mariadb-dev mysql -p123456
|
|
59
|
+ $(call msgnl,RUN MIGRATIONS)
|
|
60
|
+ @diesel migration run
|
|
61
|
+
|
|
62
|
+downdb:
|
|
63
|
+ $(call msgnl,STOP DB CONTAINER)
|
|
64
|
+ @docker stop mariadb-dev||true
|
|
65
|
+ $(call msgnl,REMOVE DB CONTAINER)
|
|
66
|
+ @docker rm -v mariadb-dev||true
|
|
67
|
+
|
40
|
68
|
devdb:
|
41
|
|
- docker network create mariadb-dev-network
|
42
|
|
- docker run --detach --network mariadb-dev-network --name mariadb-dev \
|
|
69
|
+ $(call msgnl,CREATE DB CONTAINER)
|
|
70
|
+ @docker run --detach --name mariadb-dev \
|
43
|
71
|
-p 3306:3306 \
|
44
|
72
|
--env MARIADB_USER=artshop \
|
45
|
73
|
--env MARIADB_PASSWORD=123456 \
|
46
|
74
|
--env MARIADB_ROOT_PASSWORD=123456 mariadb:latest
|
47
|
75
|
|
48
|
76
|
enterdb:
|
49
|
|
- docker exec -it mariadb-dev mysql -D artshop -u artshop -p
|
|
77
|
+ docker exec -it mariadb-dev mysql -D artshop -u artshop -p123456||true
|
50
|
78
|
# docker run -it --network mariadb-dev-network --rm mariadb:latest \
|
51
|
79
|
# mysql -h mariadb-dev -u artshop -p
|
52
|
80
|
|
53
|
81
|
rootdb:
|
54
|
|
- docker exec -it mariadb-dev mysql -p
|
|
82
|
+ docker exec -it mariadb-dev mysql -p123456||true
|
55
|
83
|
|
56
|
84
|
clean:
|
57
|
85
|
cargo clean
|
...
|
...
|
|