@@ -8,11 +8,13 @@ DB_USER ?= postgres
8
8
DB_PASS ?= password
9
9
DB_URI := postgres://$(DB_USER ) :$(DB_PASS ) @$(DB_HOST ) :5432/dl
10
10
11
- GRPC_PORT ?= 5051
12
11
GRPC_HOST ?= localhost
12
+ GRPC_PORT ?= 5051
13
+ GRPC_CACHED_PORT ?= 5053
13
14
14
- DEV_TOKEN_ADMIN ?= v2.public.eyJzdWIiOiJhZG1pbiIsImlhdCI6IjIwMjEtMTAtMTVUMTE6MjA6MDAuMDM0WiJ9WtEey8KfQQRy21xoHq1C5KQatEevk8RxS47k4bRfMwVCPHumZmVuk6ADcfDHTmSnMtEGfFXdxnYOhRP6Clb_Dw
15
- DEV_TOKEN_PROJECT_1 ?= v2.public.eyJzdWIiOiIxIiwiaWF0IjoiMjAyMS0xMC0xNVQxMToyMDowMC4wMzVaIn2MQ14RfIGpoEycCuvRu9J3CZp6PppUXf5l5w8uKKydN3C31z6f6GgOEPNcnwODqBnX7Pjarpz4i2uzWEqLgQYD
15
+ DEV_TOKEN_ADMIN ?= v2.public.eyJzdWIiOiJhZG1pbiJ9yt40HNkcyOUtDeFa_WPS6vi0WiE4zWngDGJLh17TuYvssTudCbOdQEkVDRD-mSNTXLgSRDXUkO-AaEr4ZLO4BQ
16
+ DEV_TOKEN_PROJECT_1 ?= v2.public.eyJzdWIiOiIxIn2jV7FOdEXafKDtAnVyDgI4fmIbqU7C1iuhKiL0lDnG1Z5-j6_ObNDd75sZvLZ159-X98_mP4qvwzui0w8pjt8F
17
+ DEV_SHARED_READER_TOKEN ?= v2.public.eyJzdWIiOiJzaGFyZWQtcmVhZGVyIn1CxWdB02s9el0Wt7qReARZ-7JtIb4Zj3D4Oiji1yXHqj0orkpbcVlswVUiekECJC16d1NrHwD2FWSwRORZn8gK
16
18
17
19
PKG_GO_FILES := $(shell find pkg/ -type f -name '* .go')
18
20
INTERNAL_GO_FILES := $(shell find internal/ -type f -name '* .go')
@@ -63,7 +65,7 @@ development/server.key:
63
65
64
66
development/server.crt : development/server.key
65
67
66
- build : internal/pb/fs.pb.go internal/pb/fs_grpc.pb.go bin/server bin/client development/server.crt
68
+ build : internal/pb/fs.pb.go internal/pb/fs_grpc.pb.go internal/pb/cache.pb.go internal/pb/cache_grpc.pb.go bin/server bin/client bin/cached development/server.crt
67
69
68
70
lint :
69
71
golangci-lint run
@@ -86,8 +88,9 @@ release/migrations.tar.gz: migrations/*
86
88
tar -zcf $@ migrations
87
89
88
90
release : build
89
- release : release/server_linux_amd64 release/server_macos_amd64 release/server_macos_arm64
90
- release : release/client_linux_amd64 release/client_macos_amd64 release/client_macos_arm64
91
+ release : release/server_linux_amd64 release/server_macos_amd64 release/server_macos_arm64 release/server_linux_arm64
92
+ release : release/client_linux_amd64 release/client_macos_amd64 release/client_macos_arm64 release/client_linux_arm64
93
+ release : release/cached_linux_amd64 release/cached_macos_amd64 release/cached_macos_arm64 release/cached_linux_arm64
91
94
release : release/migrations.tar.gz
92
95
93
96
test : export DB_URI = postgres://$(DB_USER ) :$(DB_PASS ) @$(DB_HOST ) :5432/dl_tests
@@ -121,6 +124,11 @@ server-profile: export DL_ENV=dev
121
124
server-profile : internal/pb/fs.pb.go internal/pb/fs_grpc.pb.go
122
125
go run cmd/server/main.go --dburi $(DB_URI ) --port $(GRPC_PORT ) --profile cpu.prof --log-level info
123
126
127
+ cached : export DL_ENV=dev
128
+ cached : export DL_TOKEN=$(DEV_SHARED_READER_TOKEN )
129
+ cached : internal/pb/cache.pb.go internal/pb/cache_grpc.pb.go
130
+ go run cmd/cached/main.go --upstream-host $(GRPC_HOST ) --upstream-port $(GRPC_PORT ) --port $(GRPC_CACHED_PORT ) --staging-path tmp/cache-stage
131
+
124
132
client-update : export DL_TOKEN=$(DEV_TOKEN_PROJECT_1 )
125
133
client-update : export DL_SKIP_SSL_VERIFICATION=1
126
134
client-update :
@@ -169,6 +177,11 @@ client-getcache: export DL_SKIP_SSL_VERIFICATION=1
169
177
client-getcache :
170
178
go run cmd/client/main.go getcache --host $(GRPC_HOST ) --path input/cache
171
179
180
+ client-getcache-from-daemon : export DL_TOKEN=$(DEV_TOKEN_ADMIN )
181
+ client-getcache-from-daemon : export DL_SKIP_SSL_VERIFICATION=1
182
+ client-getcache-from-daemon :
183
+ mkdir -p tmp/pods/test-pod/volumes/example && go run cmd/client/main.go getcache-from-daemon --host $(GRPC_HOST ) --port $(GRPC_CACHED_PORT ) input/cache
184
+
172
185
client-gc-contents : export DL_TOKEN=$(DEV_TOKEN_ADMIN )
173
186
client-gc-contents : export DL_SKIP_SSL_VERIFICATION=1
174
187
client-gc-contents :
@@ -197,15 +210,14 @@ else
197
210
docker push gcr.io/gadget-core-production/dateilager:latest
198
211
endif
199
212
200
- upload-prerelease-container-image : release
201
- docker build -t gcr.io/gadget-core-production/dateilager:$(GIT_COMMIT ) .
202
- docker push gcr.io/gadget-core-production/dateilager:$(GIT_COMMIT )
213
+ upload-prerelease-container-image :
214
+ docker build --platform linux/arm64,linux/amd64 --push -t us-central1-docker.pkg.dev/gadget-core-production/core-production/dateilager:pre-$(GIT_COMMIT ) .
203
215
204
216
build-local-container :
205
- docker build -t dl-local:latest .
217
+ docker build --load - t dl-local:dev .
206
218
207
219
run-container : release build-local-container
208
- docker run --rm -it -p 127.0.0.1:$(GRPC_PORT ) :$(GRPC_PORT ) /tcp -v ./development:/home/main/secrets/tls -v ./development:/home/main/secrets/paseto dl-local:latest $(GRPC_PORT ) " postgres://$( DB_USER) :$( DB_PASS) @host.docker.internal:5432" dl
220
+ docker run --rm -it -p 127.0.0.1:$(GRPC_PORT ) :$(GRPC_PORT ) /tcp -v ./development:/home/main/secrets/tls -v ./development:/home/main/secrets/paseto dl-local:dev $(GRPC_PORT ) " postgres://$( DB_USER) :$( DB_PASS) @host.docker.internal:5432" dl
209
221
210
222
gen-docs :
211
223
go run cmd/gen-docs/main.go
@@ -243,8 +255,10 @@ else
243
255
cd js && npm install
244
256
endif
245
257
246
- js/src/pb : $(PROTO_FILES )
247
- cd js && mkdir -p ./src/pb && npx protoc --experimental_allow_proto3_optional --ts_out ./src/pb --ts_opt long_type_bigint,ts_nocheck,eslint_disable,add_pb_suffix --proto_path ../internal/pb/ ../$^
258
+ js/src/pb : js/node_modules $(PROTO_FILES )
259
+ cd js && mkdir -p ./src/pb && for proto in $^; do \
260
+ npx protoc --experimental_allow_proto3_optional --ts_out ./src/pb --ts_opt long_type_bigint,ts_nocheck,eslint_disable,add_pb_suffix --proto_path ../internal/pb/ ../$$ proto; \
261
+ done
248
262
249
263
js/dist : js/node_modules js/src/pb
250
264
cd js && npm run build
0 commit comments