diff --git a/.build.yml b/.build.yml index d13511b..87646ae 100644 --- a/.build.yml +++ b/.build.yml @@ -37,13 +37,11 @@ tasks: cd alpine-cli go-task build - # publish the image using the just recipe + # publish the image using task # - set environment variables from the ~/.envdir directory. see # http://smarden.org/runit/chpst.8.html for details on chpst - # - sudo (-u root) is required to run podman without more setup - # - sudo --preserve-env is required to pass environment variables - publish: | cd alpine-cli chpst -e ~/.envdir go-task publish - # chpst -e ~/.envdir sudo --preserve-env just registry=docker.io registry_pass_var=DH_PAT publish - # chpst -e ~/.envdir sudo --preserve-env just registry=quay.io registry_pass_var=QUAY_PAT publish + chpst -e ~/.envdir go-task registry=docker.io registry_pass_var=DH_PAT publish + chpst -e ~/.envdir go-task registry=quay.io registry_pass_var=QUAY_PAT publish diff --git a/Taskfile.yml b/Taskfile.yml index 97d38a2..f17edf4 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -45,7 +45,7 @@ tasks: - podman manifest push {{.REGISTRY}}/{{.IMAGE}}:{{default .TAG .ALT_TAG}} - podman logout {{.REGISTRY}} vars: - REGISTRY_PASS_VAR: GH_PAT - REGISTRY: ghcr.io - REGISTRY_USER: jswank + REGISTRY_PASS_VAR: '{{.GH_PAT | default .DOCKERHUB_PAT}}' + REGISTRY: '{{.REGISTRY | default "docker.io"}}' + REGISTRY_USER: '{{.REGISTRY_USER | default "jswank"}}'