revert sr.ht builds to just+image rather than task+manifest

This commit is contained in:
Jason Swank 2024-06-17 22:28:09 -04:00
parent f28f3e7a68
commit f42565d3e7
2 changed files with 14 additions and 7 deletions

View File

@ -1,24 +1,31 @@
image: alpine/edge image: alpine/latest
secrets: secrets:
- 0ee986ff-5686-43cd-ac3a-1fe5b2e5dd8f - 0ee986ff-5686-43cd-ac3a-1fe5b2e5dd8f
- f523ee29-5ef8-490f-8903-43ad7c49060b - f523ee29-5ef8-490f-8903-43ad7c49060b
- 130adee5-3a8f-4035-8cad-e3d044be2961 - 130adee5-3a8f-4035-8cad-e3d044be2961
sources: sources:
- https://git.sr.ht/~jswank/alpine-cli#3 - https://git.sr.ht/~jswank/alpine-cli#3
packages: packages:
- podman - podman
- go-task - go-task
- runit - runit
tasks: tasks:
# cgroups need to be running in order to run podman # cgroups need to be running in order to run podman
- prep: | - prep: |
sudo rc-service cgroups start sudo rc-service cgroups start
sleep 1 sleep 1
# build the image using the just recipe # build the image using the just recipe
# - sudo (-u root) is required to run podman without more setup # - sudo (-u root) is required to run podman without more setup
- build: | - build: |
cd alpine-cli cd alpine-cli
sudo --preserve-env go-task build sudo --preserve-env just build
# sudo --preserve-env go-task build
# publish the image using the just recipe # publish the image using the just recipe
# - set environment variables from the ~/.envdir directory. see # - set environment variables from the ~/.envdir directory. see
# http://smarden.org/runit/chpst.8.html for details on chpst # http://smarden.org/runit/chpst.8.html for details on chpst
@ -26,6 +33,7 @@ tasks:
# - sudo --preserve-env is required to pass environment variables # - sudo --preserve-env is required to pass environment variables
- publish: | - publish: |
cd alpine-cli cd alpine-cli
chpst -e ~/.envdir sudo --preserve-env go-task publish chpst -e ~/.envdir sudo --preserve-env just registry_pass_var=GH_PAT publish
# chpst -e ~/.envdir sudo --preserve-env just registry=docker.io registry_pass_var=DH_PAT publish # chpst -e ~/.envdir sudo --preserve-env 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 sudo --preserve-env just registry=quay.io registry_pass_var=QUAY_PAT publish

View File

@ -11,12 +11,11 @@ registry_pass_var := "REGISTRY_PASSWORD"
# build a new image # build a new image
build flags="": build flags="":
podman manifest create {{image}}:{{tag}} podman build -t {{image}}:{{tag}} {{flags}} -f Dockerfile ctx
podman build --platform linux/amd64,linux/arm64 --manifest {{image}}:{{tag}} {{flags}} -f Dockerfile ctx
# publish the image # publish the image
publish alt_tag=tag: publish alt_tag=tag:
@ podman tag {{image}}:{{tag}} {{registry}}/{{image}}:{{alt_tag}} @ podman tag {{image}}:{{tag}} {{registry}}/{{image}}:{{alt_tag}}
@ echo "${{ registry_pass_var }}" | podman login {{registry}} -u {{registry_user}} --password-stdin @ echo "${{ registry_pass_var }}" | podman login {{registry}} -u {{registry_user}} --password-stdin
@ podman manifest push {{registry}}/{{image}}:{{alt_tag}} @ podman push {{registry}}/{{image}}:{{alt_tag}}
@ podman logout {{registry}} @ podman logout {{registry}}