diff --git a/build.sh b/build.sh index 2eeee34..4371c0c 100755 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ echo "Building BitBetter for BitWarden version $BW_VERSION" cp "$DIR/.keys/cert.cert" "$DIR/src/bitBetter/.keys" -docker run --rm -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/sdk:5.0 sh build.sh +docker run --rm -v "$DIR/src/bitBetter:/bitBetter" -w=/bitBetter mcr.microsoft.com/dotnet/sdk:6.0 sh build.sh docker build --no-cache --build-arg BITWARDEN_TAG=bitwarden/api:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/api "$DIR/src/bitBetter" # --squash docker build --no-cache --build-arg BITWARDEN_TAG=bitwarden/identity:$BW_VERSION --label com.bitwarden.product="bitbetter" -t bitbetter/identity "$DIR/src/bitBetter" # --squash diff --git a/src/bitBetter/Dockerfile b/src/bitBetter/Dockerfile index 03ffe03..07bf05c 100644 --- a/src/bitBetter/Dockerfile +++ b/src/bitBetter/Dockerfile @@ -1,7 +1,7 @@ ARG BITWARDEN_TAG FROM ${BITWARDEN_TAG} -COPY bin/Debug/netcoreapp5.0/publish/* /bitBetter/ +COPY bin/Debug/netcoreapp6.0/publish/* /bitBetter/ COPY ./.keys/cert.cert /newLicensing.cer RUN set -e; set -x; \ diff --git a/src/bitBetter/bitBetter.csproj b/src/bitBetter/bitBetter.csproj index 1e52709..43d79ed 100644 --- a/src/bitBetter/bitBetter.csproj +++ b/src/bitBetter/bitBetter.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp5.0 + netcoreapp6.0 diff --git a/src/licenseGen/Dockerfile b/src/licenseGen/Dockerfile index 6541101..2ca6a37 100644 --- a/src/licenseGen/Dockerfile +++ b/src/licenseGen/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 as build +FROM mcr.microsoft.com/dotnet/sdk:6.0 as build WORKDIR /licenseGen @@ -12,6 +12,6 @@ RUN set -e; set -x; \ FROM bitbetter/api -COPY --from=build /licenseGen/bin/Debug/netcoreapp5.0/publish/* /app/ +COPY --from=build /licenseGen/bin/Debug/netcoreapp6.0/publish/* /app/ ENTRYPOINT [ "dotnet", "/app/licenseGen.dll", "--core", "/app/Core.dll", "--cert", "/cert.pfx" ] diff --git a/src/licenseGen/licenseGen.csproj b/src/licenseGen/licenseGen.csproj index 5c38c89..0edfd9a 100644 --- a/src/licenseGen/licenseGen.csproj +++ b/src/licenseGen/licenseGen.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp5.0 + netcoreapp6.0