Skip to content

Commit

Permalink
fix: Revert arm64 build changes (#5109)
Browse files Browse the repository at this point in the history
  • Loading branch information
nwalters512 committed Nov 19, 2021
1 parent 048d8ef commit 0473cb9
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 3 deletions.
1 change: 0 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
!.eslintrc.js
!.prettierignore
!.prettierrc.json
!.yarnrc
!tsconfig.json
!admin_queries/
!api/
Expand Down
40 changes: 39 additions & 1 deletion .github/workflows/images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
uses: docker/build-push-action@v2 # https://github.com/marketplace/actions/build-and-push-docker-images
with:
context: .
platforms: linux/amd64,linux/arm64
platforms: linux/amd64
push: true
no-cache: true
tags: prairielearn/prairielearn:latest
Expand Down Expand Up @@ -159,3 +159,41 @@ jobs:
push: true
no-cache: true
tags: prairielearn/workspace-xtermjs:latest


######################################################################################################
######################################################################################################
######################################################################################################
######################################################################################################
#
# ARM64
#
# We should be able to use `platforms: linux/amd64,linux/arm64`
# above to build all images on both platforms simultaneously,
# but the arm64 builds with postgres are currently not reliable
# on GitHub Actions. This seems to be because we are using qemu
# on x86 build hosts to build the arm64 images. A similar issue
# with postgis:
# https://github.com/postgis/docker-postgis/issues/216
#
# Note that we have also set `continue-on-error: true` for the
# separate arm64 builds. If these become reliable in the future
# then we should remove this.
#
######################################################################################################
######################################################################################################
######################################################################################################
######################################################################################################


######################################################################################################
# prairielearn
- name: Build and push prairielearn/prairielearn
uses: docker/build-push-action@v2 # https://github.com/marketplace/actions/build-and-push-docker-images
with:
context: .
platforms: linux/arm64
push: true
no-cache: true
tags: prairielearn/prairielearn:arm
continue-on-error: true
1 change: 0 additions & 1 deletion .yarnrc

This file was deleted.

0 comments on commit 0473cb9

Please sign in to comment.