diff --git a/Build/common/export-variables.sh b/Build/common/export-variables.sh index 7a4b4fe..5b7866e 100644 --- a/Build/common/export-variables.sh +++ b/Build/common/export-variables.sh @@ -1,6 +1,7 @@ #!/bin/bash -BUILD_ARGS="--runtime $RUNTIME -p:Configuration=Release -p:GithubDistrib=true" +DOTNET_RUNTIME=${DOTNET_RUNTIME:-$RUNTIME} +BUILD_ARGS="--runtime $DOTNET_RUNTIME -p:Configuration=Release -p:GithubDistrib=true" FRAMEWORK="net8.0" DIST="/source/dist" RESOURCES="/source/Build/${RUNTIME}" @@ -14,7 +15,7 @@ TITLE="$(cat $PROJECT_FILE | sed -n 's/.*\(.*\)<\/Title>.*/\1/p')" if [ -f "$VERSION_FILE" ]; then VERSION="$(cat $VERSION_FILE | sed -n 's/.*<Version>\(.*\)<\/Version>.*/\1/p')" fi -PUBLISH_FOLDER="/source/BTCPayServer.Vault/bin/Release/$FRAMEWORK/$RUNTIME/publish" +PUBLISH_FOLDER="/source/BTCPayServer.Vault/bin/Release/$FRAMEWORK/$DOTNET_RUNTIME/publish" EXECUTABLE="$(cat $PROJECT_FILE | sed -n 's/.*<TargetName>\(.*\)<\/TargetName>.*/\1/p')" mkdir -p "$DIST" diff --git a/Build/debian-x64/Dockerfile b/Build/debian-x64/Dockerfile index 38d772f..fe86456 100644 --- a/Build/debian-x64/Dockerfile +++ b/Build/debian-x64/Dockerfile @@ -15,7 +15,8 @@ ARG PGP_KEY="" RUN ! [[ "${PGP_KEY}" ]] || apt-get install -y debsigs WORKDIR /source -ENV RUNTIME "linux-x64" +ENV DOTNET_RUNTIME "linux-x64" +ENV RUNTIME "debian-x64" COPY "Build/common" "Build/common" ENV EXPORT_VARIABLES "source Build/common/export-variables.sh" COPY BTCPayServer.Vault/BTCPayServer.Vault.csproj BTCPayServer.Vault/BTCPayServer.Vault.csproj