Skip to content

Commit

Permalink
feat: Re-enable image builds for arm64 for redwood
Browse files Browse the repository at this point in the history 
- The maintainers of `didkit` have released an update that fixes an issue where it would not build on arm64-based systems.
This resolves an issue with Devstack and developers running devstack on Apple silicon-based machines.
- this fix is merged in master, backporting this fix to work with redwood.
openedx#2546
  • Loading branch information
@justinhynes
justinhynes authored and Muhammad Faraz Maqsood committed Oct 17, 2024
1 parent cbb3eb3 commit 0ae7818
Show file tree
Hide file tree
Showing 8 changed files with 408 additions and 54 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/push-docker-image.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
openedx/credentials:${{ steps.get-tag-name.outputs.result }}
openedx/credentials:${{ github.sha }}
platforms: linux/amd64,linux/arm64

- name: Build and push dev Docker image
uses: docker/build-push-action@v5
with:
Expand All @@ -61,4 +60,4 @@ jobs:
tags: |
openedx/credentials-dev:${{ steps.get-tag-name.outputs.result }}
openedx/credentials-dev:${{ github.sha }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64
112 changes: 96 additions & 16 deletions requirements/all.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ bleach==6.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
boto3==1.34.99
boto3==1.34.161
# via
# -r requirements/production.txt
# django-ses
botocore==1.34.99
botocore==1.34.161
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -127,7 +127,7 @@ defusedxml==0.8.0rc2
# -r requirements/production.txt
# python3-openid
# social-auth-core
didkit==0.3.2
didkit==0.3.3
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -339,11 +339,84 @@ fontawesomefree==6.5.1
# -r requirements/production.txt
gevent==24.2.1
# via -r requirements/production.txt
google-api-core[grpc]==2.19.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# firebase-admin
# google-api-python-client
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.141.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# firebase-admin
google-auth==2.33.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
# google-api-python-client
# google-auth-httplib2
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-auth-httplib2==0.2.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-python-client
google-cloud-core==2.4.1
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# firebase-admin
google-cloud-storage==2.18.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# firebase-admin
google-crc32c==1.5.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-cloud-storage
# google-resumable-media
google-resumable-media==2.7.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-cloud-storage
googleapis-common-protos==1.63.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
# grpcio-status
greenlet==3.0.3
# via
# -r requirements/production.txt
# gevent
gunicorn==22.0.0
grpcio==1.65.4
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
# grpcio-status
grpcio-status==1.65.4
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
gunicorn==23.0.0
# via -r requirements/production.txt
httpretty==1.1.4
# via -r requirements/dev.txt
Expand Down Expand Up @@ -487,7 +560,22 @@ polib==1.2.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-i18n-tools
psutil==5.9.8
proto-plus==1.24.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
# google-cloud-firestore
protobuf==5.27.3
# via
# -r requirements/dev.txt
# -r requirements/production.txt
# google-api-core
# google-cloud-firestore
# googleapis-common-protos
# grpcio-status
# proto-plus
psutil==6.0.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -645,7 +733,7 @@ semantic-version==2.10.0
# -r requirements/dev.txt
# -r requirements/production.txt
# edx-drf-extensions
simplejson==3.19.2
simplejson==3.19.3
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -698,19 +786,11 @@ text-unidecode==1.3
# -r requirements/dev.txt
# -r requirements/production.txt
# python-slugify
tomli==2.0.1
# via
# -r requirements/dev.txt
# black
# pylint
# pyproject-api
# pytest
# tox
tomlkit==0.12.4
tomlkit==0.13.2
# via
# -r requirements/dev.txt
# pylint
tox==4.15.0
tox==4.18.0
# via -r requirements/dev.txt
typing-extensions==4.11.0
# via
Expand Down
64 changes: 61 additions & 3 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ defusedxml==0.8.0rc2
# via
# python3-openid
# social-auth-core
didkit==0.3.2
didkit==0.3.3
# via -r requirements/base.in
django==4.2.16
# via
Expand Down Expand Up @@ -165,6 +165,53 @@ fastavro==1.9.4
# via openedx-events
fontawesomefree==6.5.1
# via -r requirements/base.in
google-api-core[grpc]==2.19.1
# via
# firebase-admin
# google-api-python-client
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.141.0
# via firebase-admin
google-auth==2.33.0
# via
# google-api-core
# google-api-python-client
# google-auth-httplib2
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-auth-httplib2==0.2.0
# via google-api-python-client
google-cloud-core==2.4.1
# via
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.2
# via firebase-admin
google-cloud-storage==2.18.2
# via firebase-admin
google-crc32c==1.5.0
# via
# google-cloud-storage
# google-resumable-media
google-resumable-media==2.7.2
# via google-cloud-storage
googleapis-common-protos==1.63.2
# via
# google-api-core
# grpcio-status
grpcio==1.65.4
# via
# google-api-core
# grpcio-status
grpcio-status==1.65.4
# via google-api-core
httplib2==0.22.0
# via
# google-api-python-client
# google-auth-httplib2
idna==3.7
# via requests
importlib-metadata==6.11.0
Expand Down Expand Up @@ -214,7 +261,18 @@ pillow==10.3.0
# via -r requirements/base.in
polib==1.2.0
# via edx-i18n-tools
psutil==5.9.8
proto-plus==1.24.0
# via
# google-api-core
# google-cloud-firestore
protobuf==5.27.3
# via
# google-api-core
# google-cloud-firestore
# googleapis-common-protos
# grpcio-status
# proto-plus
psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
Expand Down Expand Up @@ -277,7 +335,7 @@ segment-analytics-python==2.3.2
# via -r requirements/base.in
semantic-version==2.10.0
# via edx-drf-extensions
simplejson==3.19.2
simplejson==3.19.3
# via
# django-rest-swagger
# sailthru-client
Expand Down
Loading

0 comments on commit 0ae7818

Please sign in to comment.