From d276bada1ee14fb481001d55735df315e8373f28 Mon Sep 17 00:00:00 2001 From: yamada28go Date: Fri, 4 Aug 2023 21:46:06 +0900 Subject: [PATCH 1/2] =?UTF-8?q?x86=E7=92=B0=E5=A2=83=E4=BB=A5=E5=A4=96?= =?UTF-8?q?=E3=81=A7=E3=83=93=E3=83=AB=E3=83=89=E3=81=A7=E3=81=8D=E3=81=AA?= =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit arm環境などでは、jqのバイナリが取得できずビルドする事ができなかった。 これらの問題を修正 --- Implem.CodeDefiner/Dockerfile | 4 ++-- Implem.Pleasanter/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Implem.CodeDefiner/Dockerfile b/Implem.CodeDefiner/Dockerfile index cf3418563..8e743581c 100644 --- a/Implem.CodeDefiner/Dockerfile +++ b/Implem.CodeDefiner/Dockerfile @@ -21,10 +21,10 @@ RUN dotnet build "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /a RUN dotnet build "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/build/Implem.Pleasanter FROM build AS publish +RUN apt-get update && apt-get install -y jq RUN dotnet publish "Implem.CodeDefiner/Implem.CodeDefiner.csproj" -c Release -o /app/publish/Implem.CodeDefiner RUN dotnet publish "Implem.Pleasanter/Implem.Pleasanter.csproj" -c Release -o /app/publish/Implem.Pleasanter -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 Implem.Pleasanter/App_Data/Parameters/Rds.json \ +RUN cat Implem.Pleasanter/App_Data/Parameters/Rds.json \ | jq '.Dbms|="PostgreSQL" | .SaConnectionString|=null | .OwnerConnectionString|=null | .UserConnectionString|=null' \ > /app/publish/Implem.Pleasanter/App_Data/Parameters/Rds.json diff --git a/Implem.Pleasanter/Dockerfile b/Implem.Pleasanter/Dockerfile index a1f6677e7..d4ba748b8 100644 --- a/Implem.Pleasanter/Dockerfile +++ b/Implem.Pleasanter/Dockerfile @@ -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 From 5ce22d08a80da09499712f8950a8cba31b77c5b9 Mon Sep 17 00:00:00 2001 From: imp-kawano <88296094+imp-kawano@users.noreply.github.com> Date: Wed, 23 Aug 2023 15:34:02 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=9Fcurl=E3=82=92install=E3=81=97=E3=81=AA?= =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Implem.CodeDefiner/Dockerfile | 2 -- Implem.Pleasanter/Dockerfile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Implem.CodeDefiner/Dockerfile b/Implem.CodeDefiner/Dockerfile index 8e743581c..67f806104 100644 --- a/Implem.CodeDefiner/Dockerfile +++ b/Implem.CodeDefiner/Dockerfile @@ -1,8 +1,6 @@ #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/runtime:6.0 AS base -RUN apt-get update && apt-get install -y curl - FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["Implem.CodeDefiner/Implem.CodeDefiner.csproj", "Implem.CodeDefiner/"] diff --git a/Implem.Pleasanter/Dockerfile b/Implem.Pleasanter/Dockerfile index d4ba748b8..15b2d185a 100644 --- 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