Skip to content

Commit

Permalink
feat: Re-enable Docker image builds for arm64 (#2546)
Browse files Browse the repository at this point in the history
* feat: Re-enable Docker image builds for arm64

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.
  • Loading branch information
justinhynes authored Aug 15, 2024
1 parent c77548a commit f7194b5
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 44 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/push-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
tags: |
openedx/credentials:${{ steps.get-tag-name.outputs.result }}
openedx/credentials:${{ github.sha }}
platforms: linux/amd64
platforms: linux/amd64,linux/arm64

- name: Build and push dev Docker image
uses: docker/build-push-action@v5
Expand All @@ -61,4 +61,4 @@ jobs:
tags: |
openedx/credentials-dev:${{ steps.get-tag-name.outputs.result }}
openedx/credentials-dev:${{ github.sha }}
platforms: linux/amd64
platforms: linux/amd64,linux/arm64
20 changes: 10 additions & 10 deletions requirements/all.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ bleach==6.1.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
boto3==1.34.159
boto3==1.34.161
# via
# -r requirements/production.txt
# django-ses
botocore==1.34.159
botocore==1.34.161
# via
# -r requirements/production.txt
# boto3
Expand Down Expand Up @@ -123,7 +123,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 @@ -379,7 +379,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.140.0
google-api-python-client==2.141.0
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand All @@ -405,7 +405,7 @@ google-cloud-core==2.4.1
# -r requirements/production.txt
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.1
google-cloud-firestore==2.17.2
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -442,7 +442,7 @@ grpcio==1.65.4
# -r requirements/production.txt
# google-api-core
# grpcio-status
grpcio-status==1.62.3
grpcio-status==1.65.4
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -606,7 +606,7 @@ proto-plus==1.24.0
# -r requirements/production.txt
# google-api-core
# google-cloud-firestore
protobuf==4.25.4
protobuf==5.27.3
# via
# -r requirements/dev.txt
# -r requirements/production.txt
Expand Down Expand Up @@ -799,7 +799,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 @@ -853,11 +853,11 @@ text-unidecode==1.3
# -r requirements/dev.txt
# -r requirements/production.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via
# -r requirements/dev.txt
# pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/dev.txt
types-pyyaml==6.0.12.20240808
# via
Expand Down
12 changes: 6 additions & 6 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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.15
# via
Expand Down Expand Up @@ -188,7 +188,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.140.0
google-api-python-client==2.141.0
# via firebase-admin
google-auth==2.33.0
# via
Expand All @@ -204,7 +204,7 @@ google-cloud-core==2.4.1
# via
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.1
google-cloud-firestore==2.17.2
# via firebase-admin
google-cloud-storage==2.18.2
# via firebase-admin
Expand All @@ -222,7 +222,7 @@ grpcio==1.65.4
# via
# google-api-core
# grpcio-status
grpcio-status==1.62.3
grpcio-status==1.65.4
# via google-api-core
httplib2==0.22.0
# via
Expand Down Expand Up @@ -282,7 +282,7 @@ proto-plus==1.24.0
# via
# google-api-core
# google-cloud-firestore
protobuf==4.25.4
protobuf==5.27.3
# via
# google-api-core
# google-cloud-firestore
Expand Down Expand Up @@ -368,7 +368,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
16 changes: 8 additions & 8 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ defusedxml==0.8.0rc2
# -r requirements/test.txt
# python3-openid
# social-auth-core
didkit==0.3.2
didkit==0.3.3
# via -r requirements/test.txt
dill==0.3.8
# via
Expand Down Expand Up @@ -286,7 +286,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.140.0
google-api-python-client==2.141.0
# via
# -r requirements/test.txt
# firebase-admin
Expand All @@ -308,7 +308,7 @@ google-cloud-core==2.4.1
# -r requirements/test.txt
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.1
google-cloud-firestore==2.17.2
# via
# -r requirements/test.txt
# firebase-admin
Expand All @@ -335,7 +335,7 @@ grpcio==1.65.4
# -r requirements/test.txt
# google-api-core
# grpcio-status
grpcio-status==1.62.3
grpcio-status==1.65.4
# via
# -r requirements/test.txt
# google-api-core
Expand Down Expand Up @@ -463,7 +463,7 @@ proto-plus==1.24.0
# -r requirements/test.txt
# google-api-core
# google-cloud-firestore
protobuf==4.25.4
protobuf==5.27.3
# via
# -r requirements/test.txt
# google-api-core
Expand Down Expand Up @@ -619,7 +619,7 @@ semantic-version==2.10.0
# via
# -r requirements/test.txt
# edx-drf-extensions
simplejson==3.19.2
simplejson==3.19.3
# via
# -r requirements/test.txt
# django-rest-swagger
Expand Down Expand Up @@ -665,11 +665,11 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via
# -r requirements/test.txt
# pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/test.txt
types-pyyaml==6.0.12.20240808
# via django-stubs
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ requests==2.32.3
# via sphinx
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
soupsieve==2.6
# via beautifulsoup4
sphinx==8.0.2
# via
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.44.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via -r requirements/pip.in
setuptools==72.1.0
setuptools==72.2.0
# via -r requirements/pip.in
16 changes: 8 additions & 8 deletions requirements/production.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ backoff==2.2.1
# segment-analytics-python
bleach==6.1.0
# via -r requirements/base.txt
boto3==1.34.159
boto3==1.34.161
# via django-ses
botocore==1.34.159
botocore==1.34.161
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -75,7 +75,7 @@ defusedxml==0.8.0rc2
# -r requirements/base.txt
# python3-openid
# social-auth-core
didkit==0.3.2
didkit==0.3.3
# via -r requirements/base.txt
django==4.2.15
# via
Expand Down Expand Up @@ -237,7 +237,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.140.0
google-api-python-client==2.141.0
# via
# -r requirements/base.txt
# firebase-admin
Expand All @@ -259,7 +259,7 @@ google-cloud-core==2.4.1
# -r requirements/base.txt
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.1
google-cloud-firestore==2.17.2
# via
# -r requirements/base.txt
# firebase-admin
Expand Down Expand Up @@ -288,7 +288,7 @@ grpcio==1.65.4
# -r requirements/base.txt
# google-api-core
# grpcio-status
grpcio-status==1.62.3
grpcio-status==1.65.4
# via
# -r requirements/base.txt
# google-api-core
Expand Down Expand Up @@ -385,7 +385,7 @@ proto-plus==1.24.0
# -r requirements/base.txt
# google-api-core
# google-cloud-firestore
protobuf==4.25.4
protobuf==5.27.3
# via
# -r requirements/base.txt
# google-api-core
Expand Down Expand Up @@ -509,7 +509,7 @@ semantic-version==2.10.0
# via
# -r requirements/base.txt
# edx-drf-extensions
simplejson==3.19.2
simplejson==3.19.3
# via
# -r requirements/base.txt
# django-rest-swagger
Expand Down
16 changes: 8 additions & 8 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ defusedxml==0.8.0rc2
# -r requirements/base.txt
# python3-openid
# social-auth-core
didkit==0.3.2
didkit==0.3.3
# via -r requirements/base.txt
dill==0.3.8
# via pylint
Expand Down Expand Up @@ -261,7 +261,7 @@ google-api-core[grpc]==2.19.1
# google-cloud-core
# google-cloud-firestore
# google-cloud-storage
google-api-python-client==2.140.0
google-api-python-client==2.141.0
# via
# -r requirements/base.txt
# firebase-admin
Expand All @@ -283,7 +283,7 @@ google-cloud-core==2.4.1
# -r requirements/base.txt
# google-cloud-firestore
# google-cloud-storage
google-cloud-firestore==2.17.1
google-cloud-firestore==2.17.2
# via
# -r requirements/base.txt
# firebase-admin
Expand All @@ -310,7 +310,7 @@ grpcio==1.65.4
# -r requirements/base.txt
# google-api-core
# grpcio-status
grpcio-status==1.62.3
grpcio-status==1.65.4
# via
# -r requirements/base.txt
# google-api-core
Expand Down Expand Up @@ -425,7 +425,7 @@ proto-plus==1.24.0
# -r requirements/base.txt
# google-api-core
# google-cloud-firestore
protobuf==4.25.4
protobuf==5.27.3
# via
# -r requirements/base.txt
# google-api-core
Expand Down Expand Up @@ -571,7 +571,7 @@ semantic-version==2.10.0
# via
# -r requirements/base.txt
# edx-drf-extensions
simplejson==3.19.2
simplejson==3.19.3
# via
# -r requirements/base.txt
# django-rest-swagger
Expand Down Expand Up @@ -616,9 +616,9 @@ text-unidecode==1.3
# via
# -r requirements/base.txt
# python-slugify
tomlkit==0.13.0
tomlkit==0.13.2
# via pylint
tox==4.17.1
tox==4.18.0
# via -r requirements/test.in
typing-extensions==4.12.2
# via
Expand Down

0 comments on commit f7194b5

Please sign in to comment.