Specify platform(?)

This commit is contained in:
Aaron Reisman 2024-10-22 00:03:06 -05:00
parent 21bedca367
commit 2bdcc221f5
2 changed files with 5 additions and 5 deletions

View File

@ -76,4 +76,4 @@ jobs:
tags: ${{ steps.metadata.outputs.tags }} tags: ${{ steps.metadata.outputs.tags }}
labels: ${{ steps.metadata.outputs.labels }} labels: ${{ steps.metadata.outputs.labels }}
build-args: | build-args: |
TARGET_ARCH=${{ matrix.arch }} TARGETARCH=${{ matrix.arch }}

View File

@ -1,11 +1,11 @@
# Dockerfile # Dockerfile
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
ARG TARGET_ARCH=amd64 ARG TARGETARCH=amd64
COPY Source /Source COPY Source /Source
RUN dotnet publish \ RUN dotnet publish \
/Source/LibationCli/LibationCli.csproj \ /Source/LibationCli/LibationCli.csproj \
--runtime linux-${TARGET_ARCH} \ --arch ${TARGETARCH} \
--configuration Release \ --configuration Release \
--output /Source/bin/Publish/Linux-chardonnay \ --output /Source/bin/Publish/Linux-chardonnay \
-p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml -p:PublishProfile=/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml
@ -28,7 +28,7 @@ RUN apt-get update && apt-get -y upgrade && \
apt-get install -y jq && \ apt-get install -y jq && \
mkdir -m777 ${LIBATION_CONFIG_INTERNAL} ${LIBATION_BOOKS_DIR} mkdir -m777 ${LIBATION_CONFIG_INTERNAL} ${LIBATION_BOOKS_DIR}
COPY --from=build-env /Source/bin/Publish/Linux-chardonnay /libation COPY --from=build /Source/bin/Publish/Linux-chardonnay /libation
COPY Docker/* /libation COPY Docker/* /libation
USER ${USER_UID}:${USER_GID} USER ${USER_UID}:${USER_GID}