Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[deploy] Allow for arm64 #3400

Draft
wants to merge 80 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
2fa8685
Update installer docs, comments, pw
imnasnainaec Oct 7, 2024
d10e3b1
Merge branch 'master' into installer
imnasnainaec Oct 7, 2024
7b93e42
Remove reference to long-gone script
imnasnainaec Oct 7, 2024
1cae5cf
Starting allowing for arm64
imnasnainaec Oct 7, 2024
9bb2118
Fix _/- error
imnasnainaec Oct 7, 2024
8ad50e7
[Docker] Move away from legacy ENV assigment
imnasnainaec Oct 8, 2024
d9c194e
[build] Clean up --quiet usage
imnasnainaec Oct 8, 2024
d055b66
Clean up comments
imnasnainaec Oct 8, 2024
cde7859
[setup_combine] Add --debug logging
imnasnainaec Oct 8, 2024
70394dd
Fix comments re The Combine
imnasnainaec Oct 8, 2024
2c9cfbd
Merge branch 'master' into installer
imnasnainaec Oct 8, 2024
5e2cadd
Merge branch 'installer' into arm
imnasnainaec Oct 9, 2024
c69987b
Change linux_arch to cpu_arch
imnasnainaec Oct 9, 2024
a6b2aa9
Toxy wants a cracker
imnasnainaec Oct 9, 2024
0cb248e
Allow package_k3s with arm
imnasnainaec Oct 9, 2024
c74138a
Merge branch 'master' into arm
imnasnainaec Oct 10, 2024
95a7237
Use --dependency-update; Add debugging; Remove junk dirs
imnasnainaec Oct 10, 2024
9326b14
Fix redundant debugging
imnasnainaec Oct 11, 2024
17e70fb
Revert README
imnasnainaec Oct 11, 2024
7af5386
Fix variable name
imnasnainaec Oct 11, 2024
6ccbf7d
Condense and cleanup README for PDF readability
imnasnainaec Oct 11, 2024
828134d
Merge branch 'installer-2' into arm
imnasnainaec Oct 11, 2024
a385286
Merge branch 'master' into installer-2
imnasnainaec Oct 11, 2024
c654e0b
Tidy
imnasnainaec Oct 11, 2024
d9a496a
More arm stuff
imnasnainaec Oct 11, 2024
18e355c
Tox-ify
imnasnainaec Oct 11, 2024
3d462b4
Merge branch 'installer-2' into arm
imnasnainaec Oct 11, 2024
ac94b9a
Merge branch 'master' into arm
imnasnainaec Oct 15, 2024
993cbb2
Set up Buildx in workflows for multi-platform builds
imnasnainaec Oct 15, 2024
a1a3dff
Debug
imnasnainaec Oct 15, 2024
03b8dca
Add registry-1.docker.io:443 to backend endpoints
imnasnainaec Oct 15, 2024
c398900
Try with QEMU
imnasnainaec Oct 15, 2024
fc58d55
Try more things
imnasnainaec Oct 15, 2024
81a8c65
Shuffle
imnasnainaec Oct 15, 2024
f86d2e5
Another backend endpoint
imnasnainaec Oct 15, 2024
c6d47f6
FROM --platform=
imnasnainaec Oct 16, 2024
8d191fb
Add docker debugging
imnasnainaec Oct 16, 2024
ba465fd
Try without QEMU and with more debugging
imnasnainaec Oct 16, 2024
d46c7a3
Restore QEMU
imnasnainaec Oct 16, 2024
15f4e55
List docker images
imnasnainaec Oct 16, 2024
87fe952
Simplify build_cmd construction
imnasnainaec Oct 21, 2024
7332e5e
Merge branch 'master' into arm
imnasnainaec Oct 24, 2024
84acfc6
Fix build.py docker debugging
imnasnainaec Oct 24, 2024
0ac5834
Use --load with docker build
imnasnainaec Oct 24, 2024
1ca51d3
Try --push instead of --load
imnasnainaec Oct 24, 2024
300605b
Try single-platform builds; only do multiplatform for the repo push
imnasnainaec Oct 24, 2024
1329012
Make tox happier
imnasnainaec Oct 24, 2024
9940617
Remove unnecessary QEMU, buildx
imnasnainaec Oct 24, 2024
ab59191
Try to deploy to QA
imnasnainaec Oct 24, 2024
330a07e
Add multiplatform to action
imnasnainaec Oct 25, 2024
ebedce3
Default to local arch
imnasnainaec Oct 25, 2024
845cbb5
Start restoring normality
imnasnainaec Oct 25, 2024
aea9b4d
More restoration
imnasnainaec Oct 25, 2024
b708408
Cleanup workflows
imnasnainaec Oct 25, 2024
fddf9bb
Update installer arch/arm arguments
imnasnainaec Oct 25, 2024
d905beb
See if --platform is necessary
imnasnainaec Oct 25, 2024
c595f89
Try qa deploy w/o QEMU
imnasnainaec Oct 25, 2024
4c08fdb
Change some info to debug
imnasnainaec Oct 29, 2024
6577f59
Merge branch 'master' into arm
imnasnainaec Oct 30, 2024
9aba448
Try updated arch-tagged images
imnasnainaec Nov 7, 2024
f899f90
Merge branch 'arm' of https://github.com/sillsdev/TheCombine into arm
imnasnainaec Nov 7, 2024
2660f70
Add aws endpoint
imnasnainaec Nov 7, 2024
062f8b3
Add cloudfront endpoint
imnasnainaec Nov 7, 2024
67a0ac1
More build experiments
imnasnainaec Nov 8, 2024
9159582
Merge branch 'master' into arm
imnasnainaec Nov 8, 2024
681e957
Focus build experiments on maintenance
imnasnainaec Nov 8, 2024
dcdeb55
Take 3
imnasnainaec Nov 8, 2024
bd12bf2
Add ports.ubuntu.com endpoint
imnasnainaec Nov 8, 2024
9be4711
Try to do more fully emulated builds
imnasnainaec Nov 8, 2024
a5bd077
Use QEMU
imnasnainaec Nov 8, 2024
f99cbf0
Re-add endpoint
imnasnainaec Nov 8, 2024
7230848
Use buildx for multiplatform build
imnasnainaec Nov 8, 2024
8fabe32
Re-add another endpoint
imnasnainaec Nov 8, 2024
2966dff
Merge branch 'master' into arm
imnasnainaec Nov 8, 2024
e76d356
Use BUILDPLATFORM just for backend builder
imnasnainaec Nov 12, 2024
29095e9
Add helm value for cpuArch
imnasnainaec Nov 13, 2024
3fd2eb2
Update buildx action from v2 to v3
imnasnainaec Nov 13, 2024
28a2ced
Merge branch 'master' into arm
imnasnainaec Nov 15, 2024
a7b7140
Add endpoint to deploy_release that was added to deploy_qa
imnasnainaec Nov 15, 2024
0a47553
Merge branch 'master' into arm
imnasnainaec Dec 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Try qa deploy w/o QEMU
  • Loading branch information
imnasnainaec committed Oct 25, 2024
commit c595f891d2e285dd0e07818ff10d53ff6655eb84
3 changes: 0 additions & 3 deletions .github/actions/combine-build/action.yml
Original file line number Diff line number Diff line change
@@ -54,9 +54,6 @@ runs:
username: ${{ inputs.aws_access_key_id }}
password: ${{ inputs.aws_secret_access_key }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ jobs:

upload_coverage:
needs: test_build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ permissions: # added using https://github.com/step-security/secure-workflows
jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
actions: read
contents: read
2 changes: 1 addition & 1 deletion .github/workflows/combine_deploy_image.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ permissions:

jobs:
dependency-review:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Harden Runner
uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
4 changes: 2 additions & 2 deletions .github/workflows/deploy_qa.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
matrix:
component: [frontend, backend, maintenance, database]

runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
image_tag: ${{ steps.build_combine.outputs.image_tag }}
steps:
@@ -64,7 +64,7 @@ jobs:
build_component: ${{ matrix.component }}
clean_ecr_repo:
needs: build
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
2 changes: 1 addition & 1 deletion .github/workflows/deploy_release.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
component: [frontend, backend, maintenance, database]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
image_tag: ${{ steps.build_combine.outputs.image_tag }}
steps:
6 changes: 3 additions & 3 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
lint_build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [20]
@@ -40,7 +40,7 @@ jobs:
- run: npm run build

test_coverage:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [20]
@@ -78,7 +78,7 @@ jobs:

upload_coverage:
needs: test_coverage
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
2 changes: 1 addition & 1 deletion .github/workflows/pages.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
# configuring harden-runner and identifying allowed endpoints.
2 changes: 1 addition & 1 deletion .github/workflows/python.yml
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ permissions: # added using https://github.com/step-security/secure-workflows

jobs:
tox:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
strategy:
matrix:
python-version: ["3.12"]
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ permissions: read-all
jobs:
analysis:
name: Scorecards analysis
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
4 changes: 2 additions & 2 deletions Backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
############################################################

# Docker multi-stage build
FROM mcr.microsoft.com/dotnet/sdk:8.0.402-jammy AS builder
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.402-jammy AS builder
WORKDIR /app

# Copy csproj and restore (fetch dependencies) as distinct layers.
@@ -19,7 +19,7 @@ COPY . ./
RUN dotnet publish -c Release -o build

# Build runtime image.
FROM mcr.microsoft.com/dotnet/aspnet:8.0.8-jammy
FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/aspnet:8.0.8-jammy

ENV ASPNETCORE_URLS=http://+:5000
ENV COMBINE_IS_IN_CONTAINER=1
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
############################################################

# User guide build environment
FROM python:3.12.5-slim-bookworm AS user_guide_builder
FROM --platform=$BUILDPLATFORM python:3.12.5-slim-bookworm AS user_guide_builder

ENV PYTHONDONTWRITEBYTECODE=1
ENV PYTHONUNBUFFERED=1
@@ -24,7 +24,7 @@ COPY docs/user_guide docs/user_guide
RUN tox -e user-guide

# Frontend build environment.
FROM node:20.17.0-bookworm-slim AS frontend_builder
FROM --platform=$BUILDPLATFORM node:20.17.0-bookworm-slim AS frontend_builder
WORKDIR /app

# Install app dependencies.
@@ -36,7 +36,7 @@ COPY . ./
RUN npm run build

# Production environment.
FROM nginx:1.27
FROM --platform=$BUILDPLATFORM nginx:1.27

WORKDIR /app

2 changes: 1 addition & 1 deletion database/Dockerfile
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
# - Intel/AMD 64-bit
# - ARM 64-bit
############################################################
FROM mongo:7.0.14-jammy
FROM --platform=$BUILDPLATFORM mongo:7.0.14-jammy

WORKDIR /

2 changes: 1 addition & 1 deletion deploy/Dockerfile
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
# - ARM 64-bit
############################################################

FROM ubuntu:22.04
FROM --platform=$BUILDPLATFORM ubuntu:22.04

USER root

2 changes: 1 addition & 1 deletion maintenance/Dockerfile
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
# - ARM 64-bit
############################################################

FROM sillsdev/aws-kubectl:0.3.0
FROM --platform=$BUILDPLATFORM sillsdev/aws-kubectl:0.3.0

USER root

Loading