diff options
| -rw-r--r-- | gitlab-ci.yml | 2 | ||||
| -rwxr-xr-x | justfile | 10 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gitlab-ci.yml b/gitlab-ci.yml index 9d1e7da..57fddde 100644 --- a/gitlab-ci.yml +++ b/gitlab-ci.yml @@ -29,7 +29,7 @@ build: if fly auth whoami > /dev/null 2>&1 then fly auth docker - just push-to-registry result --tmpdir=$TMPDIR + just push-to-registry docker://$(just evaluate fly-registry):$DOCKER_TAG result --tmpdir=$TMPDIR just print-docker-tag >> build.env fi artifacts: diff --git a/justfile b/justfile index 627e417..d6c813f 100755 --- a/justfile +++ b/justfile @@ -45,13 +45,11 @@ docker-inspect image-path="result" *skopeo-flags="": print-docker-tag: @echo {{ docker-tag }} -# docker://some_docker_registry/myimage:tag -stream-to-registry registry-and-tag=("docker://" + fly-registry + ":" + docker-tag) *skopeo-flags="": - just docker-stream-fly | gzip --fast | skopeo {{ skopeo-flags }} copy --dest-precompute-digests docker-archive:/dev/stdin {{ registry-and-tag }} +stream-to-registry *skopeo-flags="": + just docker-stream-fly | gzip --fast | skopeo {{ skopeo-flags }} copy --dest-precompute-digests docker-archive:/dev/stdin ("docker://" + fly-registry + ":" + docker-tag) -# docker://some_docker_registry/myimage:tag -push-to-registry registry-and-tag=("docker://" + fly-registry + ":" + docker-tag) image-path=`readlink -f result` *skopeo-flags="": - skopeo {{ skopeo-flags }} copy --dest-precompute-digests {{ image-path }} {{ registry-and-tag }} +push-to-registry *skopeo-flags="": + echo skopeo {{ skopeo-flags }} copy --dest-precompute-digests `readlink -f result` ("docker://" + fly-registry + ":" + docker-tag) deploy registry-and-tag=(fly-registry + ":" + docker-tag): fly deploy --image {{ registry-and-tag }} |