Skip to content

Commit

Permalink
Make Dockerfiles architecture neutral (#3310)
Browse files Browse the repository at this point in the history
* Make Dockerfiles architecture neutral

* Add note that deploy/Dockerfile is amd64 only
  • Loading branch information
jmgrady authored Aug 15, 2024
1 parent 87e875b commit ac10ab1
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 11 deletions.
12 changes: 10 additions & 2 deletions Backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
7 changes: 7 additions & 0 deletions database/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
############################################################
# IMPORTANT
#
# Supported Platforms:
# - Intel/AMD 64-bit
# - ARM 64-bit
############################################################
FROM mongo:7.0.12-jammy

WORKDIR /
Expand Down
15 changes: 6 additions & 9 deletions deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 8 additions & 0 deletions maintenance/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ac10ab1

Please sign in to comment.