From 1bb967b72fa7f583002a85f25b80d17fbc023193 Mon Sep 17 00:00:00 2001 From: mattstam Date: Mon, 5 Aug 2024 12:01:06 -0700 Subject: [PATCH] fix: docker build xz-utils off main --- .github/workflows/docker-publish-gnark.yml | 6 +++--- cli/docker/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish-gnark.yml b/.github/workflows/docker-publish-gnark.yml index 34be51d005..f00822283a 100644 --- a/.github/workflows/docker-publish-gnark.yml +++ b/.github/workflows/docker-publish-gnark.yml @@ -66,8 +66,8 @@ jobs: id: docker_tagging run: | if [[ "${{ github.event_name }}" == 'workflow_dispatch' ]]; then - echo "manual trigger from workflow_dispatch, assigning tag ${{ github.event.inputs.tags }}" - echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.event.inputs.tags }}" >> $GITHUB_OUTPUT + echo "manual trigger from workflow_dispatch, assigning tag v1.1.0" + echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:v1.1.0" >> $GITHUB_OUTPUT elif [[ "${{ github.event_name }}" == 'schedule' ]]; then echo "cron trigger, assigning nightly tag" echo "docker_tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly-${GITHUB_SHA}" >> $GITHUB_OUTPUT @@ -98,5 +98,5 @@ jobs: cache-to: type=gha,mode=max build-args: | BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }} - VERSION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} + VERSION=v1.1.0 REVISION=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.revision'] }} diff --git a/cli/docker/Dockerfile b/cli/docker/Dockerfile index f639579a00..2b4a4cf4a1 100644 --- a/cli/docker/Dockerfile +++ b/cli/docker/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:24.04@sha256:e3f92abc0967a6c19d0dfa2d55838833e947b9d74edbcb0113e48535ad4be12a RUN apt-get update \ - && apt-get install -y --no-install-recommends ca-certificates clang curl libssl-dev pkg-config git dialog \ + && apt-get install -y --no-install-recommends ca-certificates clang curl libssl-dev pkg-config git dialog xz-utils \ && curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL 'https://sh.rustup.rs' | sh -s -- -y ENV PATH="/root/.cargo/bin:${PATH}"