From ac10ab1c1f8b1266b2b49ebfd521dd6db0ac9716 Mon Sep 17 00:00:00 2001 From: Jim Grady Date: Thu, 15 Aug 2024 11:54:51 -0400 Subject: [PATCH] Make Dockerfiles architecture neutral (#3310) * Make Dockerfiles architecture neutral * Add note that deploy/Dockerfile is amd64 only --- Backend/Dockerfile | 12 ++++++++++-- Dockerfile | 8 ++++++++ database/Dockerfile | 7 +++++++ deploy/Dockerfile | 15 ++++++--------- maintenance/Dockerfile | 8 ++++++++ 5 files changed, 39 insertions(+), 11 deletions(-) diff --git a/Backend/Dockerfile b/Backend/Dockerfile index b33c61290a..63da41c087 100644 --- a/Backend/Dockerfile +++ b/Backend/Dockerfile @@ -1,5 +1,13 @@ +############################################################ +# IMPORTANT +# +# Supported Platforms: +# - Intel/AMD 64-bit +# - ARM 64-bit +############################################################ + # Docker multi-stage build -FROM mcr.microsoft.com/dotnet/sdk:8.0.303-jammy-amd64 AS builder +FROM mcr.microsoft.com/dotnet/sdk:8.0.303-jammy AS builder WORKDIR /app # Copy csproj and restore (fetch dependencies) as distinct layers. @@ -11,7 +19,7 @@ COPY . ./ RUN dotnet publish -c Release -o build # Build runtime image. -FROM mcr.microsoft.com/dotnet/aspnet:8.0.7-jammy-amd64 +FROM mcr.microsoft.com/dotnet/aspnet:8.0.7-jammy ENV ASPNETCORE_URLS=http://+:5000 ENV COMBINE_IS_IN_CONTAINER=1 diff --git a/Dockerfile b/Dockerfile index c75c88d13e..47d0cc3b25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,11 @@ +############################################################ +# IMPORTANT +# +# Supported Platforms: +# - Intel/AMD 64-bit +# - ARM 64-bit +############################################################ + # User guide build environment FROM python:3.10.14-slim-bookworm AS user_guide_builder diff --git a/database/Dockerfile b/database/Dockerfile index 465f9482d1..5fa00cbf0d 100644 --- a/database/Dockerfile +++ b/database/Dockerfile @@ -1,3 +1,10 @@ +############################################################ +# IMPORTANT +# +# Supported Platforms: +# - Intel/AMD 64-bit +# - ARM 64-bit +############################################################ FROM mongo:7.0.12-jammy WORKDIR / diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 1e1b87c39d..d78140dd22 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,12 +1,9 @@ -# Dockerfile to build a Kubernetes Worker container for the Combine. The -# image shall contain a collection of scripts to perform the following functions: -# - backup The Combine database and backend data files -# - restore The Combine database and backend data files from a previous backup -# - monitor specified secrets for changes and push the updated secrets to AWS -# S3 storage -# - check the current TLS secret for updates in AWS S3 storage and update the -# secret accordingly. -# The scripts are written in Python. +############################################################ +# IMPORTANT +# +# Supported Platforms: +# - Intel/AMD 64-bit +############################################################ FROM ubuntu:22.04 diff --git a/maintenance/Dockerfile b/maintenance/Dockerfile index b897aa2dbb..83c22944e1 100644 --- a/maintenance/Dockerfile +++ b/maintenance/Dockerfile @@ -8,6 +8,14 @@ # secret accordingly. # The scripts are written in Python. +############################################################ +# IMPORTANT +# +# Supported Platforms: +# - Intel/AMD 64-bit +# - ARM 64-bit +############################################################ + FROM sillsdev/aws-kubectl:0.3.0 USER root