From 50ba961fba0318f22ed33d76b6585ebe3bafdb64 Mon Sep 17 00:00:00 2001 From: gambtho Date: Fri, 24 Mar 2023 16:20:16 -0400 Subject: [PATCH 1/4] move devhostagent to mariner --- src/devhostagent/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/devhostagent/Dockerfile b/src/devhostagent/Dockerfile index c1c29af3..fb9c7719 100644 --- a/src/devhostagent/Dockerfile +++ b/src/devhostagent/Dockerfile @@ -1,5 +1,9 @@ # Build container -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.16 AS build-alpine +FROM mcr.microsoft.com/dotnet/sdk:6.0-cbl-mariner2.0 AS build + +RUN tdnf clean all && \ + tdnf check-update && \ + tdnf upgrade -y ARG Configuration=Release ARG TelemetryType=TELEMETRY_DEVELOPMENT @@ -18,7 +22,13 @@ ENV MINDARO_BUILD_NUMBER=${MindaroBuildNumber} RUN dotnet publish -c ${Configuration} -o /src/publish devhostAgent.csproj # Final container -FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine3.16 as final +FROM mcr.microsoft.com/dotnet/aspnet:6.0-cbl-mariner2.0 as final + +RUN tdnf clean all && \ + tdnf check-update && \ + tdnf upgrade -y && \ + tdnf install -y bind-utils + WORKDIR /src/devhostagent -COPY --from=build-alpine /src/publish /src/devhostagent +COPY --from=build /src/publish /src/devhostagent ENTRYPOINT ["dotnet", "/src/devhostagent/Microsoft.BridgeToKubernetes.DevHostAgent.dll"] \ No newline at end of file From 662e315a1189836aad4f90a4d3bc5d4ef4789755 Mon Sep 17 00:00:00 2001 From: gambtho Date: Fri, 24 Mar 2023 16:25:58 -0400 Subject: [PATCH 2/4] move devhostagent restorationjob to mariner --- src/devhostagent.restorationjob/Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/devhostagent.restorationjob/Dockerfile b/src/devhostagent.restorationjob/Dockerfile index d611e274..e5887fc7 100644 --- a/src/devhostagent.restorationjob/Dockerfile +++ b/src/devhostagent.restorationjob/Dockerfile @@ -1,5 +1,5 @@ # Build container -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.16 AS build-alpine +FROM mcr.microsoft.com/dotnet/sdk:6.0-cbl-mariner2.0 AS build ARG Configuration=Release ARG TelemetryType=TELEMETRY_DEVELOPMENT @@ -18,17 +18,23 @@ ENV MINDARO_BUILD_NUMBER=${MindaroBuildNumber} RUN dotnet publish -c ${Configuration} -o /output devhostAgent.restorationjob.csproj # Final container -FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine3.16 as final +FROM mcr.microsoft.com/dotnet/aspnet:6.0-cbl-mariner2.0 as final # Setup common tools -COPY /build/setup-alpine-tools.sh . +RUN tdnf clean all && \ + tdnf check-update && \ + tdnf upgrade -y + +RUN tdnf install -y \ + procps \ + bind-utils + COPY /build/setup-kubectl.sh . -RUN chmod +x ./setup-alpine-tools.sh ./setup-kubectl.sh \ - && ./setup-alpine-tools.sh \ +RUN chmod +x ./setup-kubectl.sh \ && ./setup-kubectl.sh \ - && rm -f ./setup-alpine-tools.sh ./setup-kubectl.sh + && rm -f ./setup-kubectl.sh WORKDIR /app ENTRYPOINT ["/app/restorationjob"] -COPY --from=build-alpine /output /app \ No newline at end of file +COPY --from=build /output /app \ No newline at end of file From fbc1d2b84773715cffae898e18cb3af6536be315 Mon Sep 17 00:00:00 2001 From: gambtho Date: Fri, 24 Mar 2023 16:53:50 -0400 Subject: [PATCH 3/4] move routingmanager to mariner --- src/routingmanager/Dockerfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/routingmanager/Dockerfile b/src/routingmanager/Dockerfile index fc485033..9f72b218 100644 --- a/src/routingmanager/Dockerfile +++ b/src/routingmanager/Dockerfile @@ -1,5 +1,5 @@ # Build container -FROM mcr.microsoft.com/dotnet/sdk:6.0-alpine3.16 AS build-alpine +FROM mcr.microsoft.com/dotnet/sdk:6.0-cbl-mariner2.0 AS build ARG Configuration=Release ARG TelemetryType=TELEMETRY_DEVELOPMENT @@ -18,20 +18,22 @@ ENV MINDARO_BUILD_NUMBER=${MindaroBuildNumber} RUN dotnet publish -c ${Configuration} -o /src/publish # Final container -FROM mcr.microsoft.com/dotnet/aspnet:6.0-alpine3.16 as final +FROM mcr.microsoft.com/dotnet/aspnet:6.0-cbl-mariner2.0 as final # Setup common tools -COPY /build/setup-alpine-tools.sh . -RUN chmod +x ./setup-alpine-tools.sh \ - && ./setup-alpine-tools.sh \ - && rm -f ./setup-alpine-tools.sh +RUN tdnf clean all && \ + tdnf check-update && \ + tdnf upgrade -y + +RUN tdnf install -y \ + procps \ + bind-utils -# Setup kubectl COPY /build/setup-kubectl.sh . RUN chmod +x ./setup-kubectl.sh \ && ./setup-kubectl.sh \ && rm -f ./setup-kubectl.sh WORKDIR /src/routingmanager -COPY --from=build-alpine /src/publish /src/routingmanager +COPY --from=build /src/publish /src/routingmanager ENTRYPOINT ["dotnet", "/src/routingmanager/Microsoft.BridgeToKubernetes.RoutingManager.dll"] From 37b8cde16681fd9ccdb5083004280b26597cd97b Mon Sep 17 00:00:00 2001 From: Hariharan Subramanian <105889062+hsubramanianaks@users.noreply.github.com> Date: Mon, 3 Apr 2023 15:07:13 -0400 Subject: [PATCH 4/4] update image tag for b2k to pick latest images --- deployment/settings/services/imagetag.setting | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/settings/services/imagetag.setting b/deployment/settings/services/imagetag.setting index c2ec8d2f..cba83933 100644 --- a/deployment/settings/services/imagetag.setting +++ b/deployment/settings/services/imagetag.setting @@ -1,4 +1,4 @@ -MINDARO_DEVHOSTAGENT_TAG=1.1.0 -MINDARO_DEVHOSTAGENT_RESTORATIONJOB_TAG=1.2.0 -MINDARO_ROUTINGMANAGER_TAG=1.1.0 +MINDARO_DEVHOSTAGENT_TAG=1.2.0 +MINDARO_DEVHOSTAGENT_RESTORATIONJOB_TAG=1.3.0 +MINDARO_ROUTINGMANAGER_TAG=1.2.0 MINDARO_LOCALAGENT_TAG=1.1.0