feat: more local tools

1 files changed, 20 insertions, 10 deletions

diff --git a/justfile b/justfile
index 2c7b066..a4b40cd 100644
--- a/justfile
+++ b/justfile
@@ -10,7 +10,10 @@ TAGS := `git tag -l`
 alias dr := debug-run
 alias dt := debug-test
 
-docker-build tag="latest":
+default:
+  @just --choose
+
+docker-build:
     new_ver=$(cat {{ NEW_VERSION }}); \
         docker build --build-arg="version=$new_ver" -t go-git-server:$new_ver .
 
@@ -27,7 +30,8 @@ new-ver part="latest": builddir
     cat {{ ALL_VERSIONS }} | bumpver --last-version patch - > {{ CURRENT_VERSION }}
     if [[ {{part}} == "latest" ]];
     then
-        bumpver patch --prerelease --prerelease-fmt 'latest.$KeyArg commit' -k commit={{COMMIT}} {{ CURRENT_VERSION }} - > {{ NEW_VERSION }}
+        bumpver patch --prerelease --prerelease-fmt 'latest.$KeyArg commit.$BumpInt' -k commit={{COMMIT}} {{ CURRENT_VERSION }} > {{ NEW_VERSION }}
+        git tag $(cat {{ NEW_VERSION }})
     else
         bumpver {{part}} <(git tag -l) > {{ NEW_VERSION }}
     fi
@@ -76,13 +80,14 @@ build version: test builddir
 
 push:
     new_ver=$(cat {{ NEW_VERSION }}); \
-        just docker-push $new_ver; \
-            just git-push $new_ver
+        just docker-push; \
+            just git-push
     @echo "pushed to all endpoints"
 
-docker-push tag="latest" registry="public.ecr.aws/s0f9o2k5":
-    docker tag go-git-server:{{tag}} {{registry}}/go-git-server:{{tag}}
-    docker push {{registry}}/go-git-server:{{tag}}
+docker-push registry="public.ecr.aws/s0f9o2k5":
+    new_ver=$(cat {{ NEW_VERSION }}); \
+        docker tag go-git-server:$new_ver {{registry}}/go-git-server:$new_ver; \
+            docker push {{registry}}/go-git-server:$new_ver
 
 run repo=(TEMPDIR):
     go run cmd/main.go -a -r {{repo}}
@@ -95,8 +100,12 @@ test:
 debug-run:
     dlv debug cmd/main.go -- -s {{justfile_directory()}}/gitserver.yaml -r {{ TEMPDIR }} -t tokens.csv -p policy.csv -m auth_model.ini -a
 
-local-push: (docker-push "latest" "localhost:5000")
-    @echo "build and push to local dir"
+local-build: clean new-ver docker-build (docker-push "localhost:5000")
+    #!/usr/bin/env bash
+    set -euxo pipefail
+    new_ver=$(cat {{ NEW_VERSION }})
+    cd manifests/local
+    kustomize edit set image go-git-server=go-git-registry:5000/go-git-server:$new_ver
 
 local-clean:
     kustomize build manifests/local | kubectl --context k3d-go-git-cluster delete -f -
@@ -105,9 +114,10 @@ local-undeploy:
     kustomize build manifests/base | kubectl --context k3d-go-git-cluster delete -f -
     kustomize build manifests/cgit | kubectl --context k3d-go-git-cluster delete -f -
 
-local-deploy:
+local-deploy: local-build
     kustomize build manifests/local | kubectl --context k3d-go-git-cluster apply -f -
 
+
 local-cluster:
     k3d cluster create go-git-cluster --registry-create go-git-registry:5000