diff options
| author | Franck Cuny <franck@fcuny.net> | 2021-09-09 18:03:00 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2021-09-09 18:09:13 -0700 |
| commit | 1c620dc4f9dcd5d90f6954c4adae07d8cae19ee7 (patch) | |
| tree | d4105c96f98a4293239339f4e1ce57c420ba25b4 | |
| parent | blog: update elisp for git/sourcegraph (diff) | |
| download | infra-1c620dc4f9dcd5d90f6954c4adae07d8cae19ee7.tar.gz | |
build: get the proper version for tagging
We were evaluating the version of the app when the rule was evaluated,
while we need to get the version after we run `flyctl deploy`.
Since we're tagging a release, let's also annotate the tag.
Remove the `--build-arg` argument to `flyct deploy` since it's being
ignored (same with `docker build`).
Closes #1.
| -rw-r--r-- | users/fcuny/blog/Makefile | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/users/fcuny/blog/Makefile b/users/fcuny/blog/Makefile index d602b52..b117922 100644 --- a/users/fcuny/blog/Makefile +++ b/users/fcuny/blog/Makefile @@ -17,16 +17,13 @@ worktree-clean: deploy: worktree-clean docker-build @echo "Deploying to fly ..." - flyctl deploy \ - --build-arg IMAGE_REF=$(DOCKER_IMAGE_REF) - @sleep 5 - git tag --message $(shell flyctl info -j |jq '.App | "\(.Name)/v\(.Version)"') $(shell flyctl info -j |jq '.App | "\(.Name)/v\(.Version)"') + flyctl deploy + @git tag -a --message $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"') $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"') docker-build: @echo "Building Docker image ..." $(DOCKER) build $(DOCKER_BUILD_ARGS) \ --tag "${DOCKER_IMAGE}:${DOCKER_IMAGE_REF}" \ - --build-arg IMAGE_REF=$(DOCKER_IMAGE_REF) \ --file "$(DOCKERFILE)" \ "$(PROJECT_DIR)" |