Skip to content

Commit 0a23dc3

Browse files
committed
Add gcloud to the devshell for authenticating against the Gadget docker registry
1 parent 1c05a74 commit 0a23dc3

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,7 @@ upload-container-image:
212212
ifndef version
213213
$(error version variable must be set)
214214
else
215-
docker build --platform linux/arm64,linux/amd64 -t gcr.io/gadget-core-production/dateilager:$(version) -t gcr.io/gadget-core-production/dateilager:latest .
216-
docker push gcr.io/gadget-core-production/dateilager:$(version)
217-
docker push gcr.io/gadget-core-production/dateilager:latest
215+
docker build --platform linux/arm64,linux/amd64 --push -t gcr.io/gadget-core-production/dateilager:$(version) -t gcr.io/gadget-core-production/dateilager:latest .
218216
endif
219217

220218
upload-prerelease-container-image:

flake.nix

+5-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
callPackage = pkgs.newScope (flake.packages // { inherit lib callPackage; });
3838
in
3939
{
40-
packages = {
40+
packages = {
4141
## DateiLager development scripts
4242

4343
clean = callPackage ./development/nix/scripts/clean.nix { };
@@ -54,6 +54,8 @@
5454

5555
postgresql = pkgs.postgresql_14;
5656

57+
google-cloud-sdk = pkgs.google-cloud-sdk;
58+
5759
golangci-lint = pkgs.golangci-lint;
5860

5961
glibcLocales = pkgs.glibcLocales;
@@ -77,6 +79,7 @@
7779
flake.packages.clean
7880
flake.packages.golangci-lint
7981
flake.packages.glibcLocales
82+
flake.packages.google-cloud-sdk
8083
git
8184
protobuf
8285
protoc-gen-go
@@ -91,7 +94,7 @@
9194
9295
# silence ginko deprecations -- they come from the csi test suite that we don't control
9396
export ACK_GINKGO_DEPRECATIONS=1.16.5
94-
'';
97+
'';
9598
};
9699
}
97100
)));

0 commit comments

Comments
 (0)