fix alpine gcp issues (#327)

* fix alpine gcp issues * version bump
Soluto · Oct 3, 2019 · ea5c707 · ea5c707
1 parent cf14e68
commit ea5c707
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -15,12 +15,17 @@ 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:2.2.7-alpine AS release
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.2.7-alpine 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 add --update --no-cahce libc6-compat
+    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
+
 
 USER dotnet
 WORKDIR /home/dotnet/app

diff --git a/Dockerfile-aspnet3 b/Dockerfile-aspnet3
@@ -20,9 +20,14 @@ ARG PROJECT_NAME=decrypt-api
 ENV PROJECT_NAME_ENV=$PROJECT_NAME
 RUN addgroup dotnet && \
     adduser -D -G dotnet -h /home/dotnet dotnet && \
-    apk add --update --no-cahce libc6-compat
+    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
 
 USER dotnet
+
 WORKDIR /home/dotnet/app
 ENV ASPNETCORE_URLS=http://+:9999
 COPY --from=build-env /app/obj/Docker/publish .

diff --git a/src/crd-controller/crd-controller.csproj b/src/crd-controller/crd-controller.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Version>0.5.1.0</Version>
+    <Version>0.5.2.0</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/decrypt-api/decrypt-api.csproj b/src/decrypt-api/decrypt-api.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.5.1.0</Version>
+    <Version>0.5.2.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />

diff --git a/src/encrypt-api/encrypt-api.csproj b/src/encrypt-api/encrypt-api.csproj
@@ -3,7 +3,7 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
   </PropertyGroup>
   <PropertyGroup>
-    <Version>0.5.1.0</Version>
+    <Version>0.5.2.0</Version>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />