set CONDUWUIT_VERSION_EXTRA for containers

This commit is contained in:
Jade Ellis 2025-01-09 16:27:34 +00:00
parent ba4b54f2b5
commit 671ab8fbc1
No known key found for this signature in database
GPG key ID: 8705A2A3EBF77BD2
2 changed files with 11 additions and 1 deletions

View file

@ -161,13 +161,20 @@ jobs:
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository. # It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step. # It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
# It will not push images generated from a pull request # It will not push images generated from a pull request
- name: Set short git commit SHA
id: sha
run: |
calculatedSha=$(git rev-parse --short ${{ github.sha }})
echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
- name: Build and push Docker image by digest - name: Build and push Docker image by digest
id: build id: build
uses: docker/build-push-action@v6 uses: docker/build-push-action@v6
with: with:
context: . context: .
file: "Containerfile" file: "Containerfile"
build-args: ${{ matrix.target_cpu != 'base' && format('TARGET_CPU={0}', matrix.target_cpu) || '' }} build-args: |
${{ matrix.target_cpu != 'base' && format('TARGET_CPU={0}', matrix.target_cpu) || '' }}
CONDUWUIT_VERSION_EXTRA=${{ env.COMMIT_SHORT_SHA }}
platforms: ${{ matrix.platform }} platforms: ${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }} labels: ${{ steps.meta.outputs.labels }}
annotations: ${{ steps.meta.outputs.annotations }} annotations: ${{ steps.meta.outputs.annotations }}

View file

@ -59,6 +59,9 @@ RUN VARS=$(case $TARGETPLATFORM in \
# enable cross-platform linking of libraries # enable cross-platform linking of libraries
RUN echo "PKG_CONFIG_ALLOW_CROSS=true" >> /etc/environment RUN echo "PKG_CONFIG_ALLOW_CROSS=true" >> /etc/environment
ARG CONDUWUIT_VERSION_EXTRA=
ENV CONDUWUIT_VERSION_EXTRA=$CONDUWUIT_VERSION_EXTRA
# Set up Rust toolchain # Set up Rust toolchain
WORKDIR /app WORKDIR /app
COPY ./rust-toolchain.toml . COPY ./rust-toolchain.toml .