Skip to content

Commit

Permalink
fix segfault when using gcp kms (Soluto#462)
Browse files Browse the repository at this point in the history
  • Loading branch information
omerlh authored and jhurdlow committed May 13, 2020
1 parent a6ae202 commit b23888b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 11 deletions.
11 changes: 3 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,11 @@ COPY ./src/key-managment ./key-managment
RUN dotnet publish $PROJECT_NAME/$PROJECT_NAME.csproj -c Release -o ./obj/Docker/publish

# Build runtime image
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine AS release
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS release
ARG PROJECT_NAME=decrypt-api
ENV PROJECT_NAME_ENV=$PROJECT_NAME
RUN addgroup dotnet && \
adduser -D -G dotnet -h /home/dotnet dotnet && \
apk --no-cache add ca-certificates wget && \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.30-r0/glibc-2.30-r0.apk && \
apk add glibc-2.30-r0.apk && \
apk del wget
RUN groupadd dotnet && \
useradd dotnet -g dotnet --home /home/dotnet

USER dotnet

Expand Down
2 changes: 1 addition & 1 deletion src/crd-controller/crd-controller.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</PropertyGroup>

<PropertyGroup>
<Version>0.6.3.0</Version>
<Version>0.6.4.0</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/decrypt-api/decrypt-api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<Version>0.6.3.0</Version>
<Version>0.6.4.0</Version>
</PropertyGroup>
<ItemGroup>
<Folder Include="Models\" />
Expand Down
2 changes: 1 addition & 1 deletion src/encrypt-api/encrypt-api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<PropertyGroup>
<Version>0.6.3.0</Version>
<Version>0.6.4.0</Version>
</PropertyGroup>
<ItemGroup>
<Folder Include="Models\" />
Expand Down

0 comments on commit b23888b

Please sign in to comment.