Merge branch 'main' of https://github.com/Implem/Implem.Pleasanter

Implem · Sep 3, 2023 · 7e07b07 · 7e07b07
2 parents 1be7c56 + 514e16e
commit 7e07b07
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Implem.Pleasanter/Dockerfile b/Implem.Pleasanter/Dockerfile
@@ -1,7 +1,7 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
 FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-RUN apt-get update && apt-get install -y libgdiplus curl
+RUN apt-get update && apt-get install -y libgdiplus
 
 WORKDIR /app
 EXPOSE 80
@@ -24,9 +24,9 @@ WORKDIR "/src/Implem.Pleasanter"
 RUN dotnet build "Implem.Pleasanter.csproj" -c Release -o /app/build
 
 FROM build AS publish
+RUN apt-get update && apt-get install -y jq
 RUN dotnet publish "Implem.Pleasanter.csproj" -c Release -o /app/publish
-RUN curl -o /usr/bin/jq -L https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && chmod +x /usr/bin/jq && \
-    cat App_Data/Parameters/Rds.json \
+RUN cat App_Data/Parameters/Rds.json \
     | jq '.Dbms|="PostgreSQL" | .SaConnectionString|=null | .OwnerConnectionString|=null | .UserConnectionString|=null' \
     > /app/publish/App_Data/Parameters/Rds.json