From df66920d0f07a1d1fd73db3a0f4d8b6aa6ce1ffb Mon Sep 17 00:00:00 2001 From: Pierre Le Fevre Date: Thu, 27 Nov 2025 21:43:56 +0100 Subject: [PATCH] fix: use umoci new to create tag within base layout --- .tangled/workflows/build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.tangled/workflows/build.yml b/.tangled/workflows/build.yml index dae5a99..4bb192d 100644 --- a/.tangled/workflows/build.yml +++ b/.tangled/workflows/build.yml @@ -52,8 +52,11 @@ steps: echo "Pulling distroless base..." skopeo copy docker://gcr.io/distroless/cc-debian12:nonroot oci:base:latest + echo "Creating new tag from base..." + umoci new --image base:grain + echo "Unpacking base image..." - umoci unpack --image base:latest bundle + umoci unpack --image base:grain bundle echo "Adding binaries to rootfs..." mkdir -p bundle/rootfs/app @@ -61,14 +64,11 @@ steps: cp target/release/grainctl bundle/rootfs/app/grainctl chmod +x bundle/rootfs/app/grain bundle/rootfs/app/grainctl - echo "Initializing output OCI layout..." - umoci init --layout grain-oci - echo "Repacking with modifications..." - umoci repack --image grain-oci:latest bundle + umoci repack --image base:grain bundle echo "Configuring image..." - umoci config --image grain-oci:latest \ + umoci config --image base:grain \ --config.workingdir /app \ --config.env RUST_LOG=info \ --config.exposedports 8888 \ @@ -80,7 +80,7 @@ steps: skopeo login --username "$DOCKER_USER" --password "$DOCKER_PASS" docker.io echo "Pushing to Docker Hub..." - skopeo copy oci:grain-oci:latest docker://docker.io/pierrelf/grain:latest - skopeo copy oci:grain-oci:latest docker://docker.io/pierrelf/grain:${TANGLED_COMMIT_SHA:0:7} + skopeo copy oci:base:grain docker://docker.io/pierrelf/grain:latest + skopeo copy oci:base:grain docker://docker.io/pierrelf/grain:${TANGLED_COMMIT_SHA:0:7} echo "Build and push completed successfully!" -- 2.51.2