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

Dockerfile fixes #4377

Merged
merged 5 commits into from
Feb 22, 2023
Merged

Dockerfile fixes #4377

merged 5 commits into from
Feb 22, 2023

Conversation

shepazon
Copy link
Contributor

@shepazon shepazon commented Feb 9, 2023

aws-doc-sdk-examples Pull Request

Thank you for making a submission to the aws-doc-sdk-examples repository. For more information about submitting pull requests to this repository, see Guidelines for contributing.

NOTE: This pull request (PR) template contains two sections. Use the section that applies to your submission, and remove the section which doesn't apply.


I'm resolving an issue with an existing code example

Versions of the Swift docker image for version 5.7 and later have differences that prevented the Dockerfile's instructions from working correctly, and did not work with the swiftbuild script. This is fixed in this commit thusly:

  • Changed the Dockerfile to pull the most recent Swift instead of Swift 5.6. This is done because the Swift 5.6 docker image doesn't work for ARM Macs.
  • Changed the name of swiftbuild to swiftbuild.py to clarify that it's a Python script.
  • Changed the Dockerfile to invoke swiftbuild by directly executing python3.10 swiftbuild.py. This both uses the name for the Python installed on the more recent image and is updated for the new name of the script.

Confirm you have met the following minimum requirements:


Open source license adherence

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Eric Shepherd added 2 commits February 9, 2023 20:01
Versions of the Swift docker image for version 5.7 and later have differences
that prevented the Dockerfile's instructions from working correctly, and did
not work with the `swiftbuild` script.  This is fixed in this commit thusly:

* Changed the Dockerfile to pull the most recent Swift instead of Swift 5.6.
  This is done because the Swift 5.6 docker image doesn't work for ARM Macs.
* Changed the name of `swiftbuild` to `swiftbuild.py` to clarify that it's a
  Python script.
* Changed the Dockerfile to invoke `swiftbuild` by directly executing
  `python3.10 swiftbuild.py`. This both uses the name for the Python installed
  on the more recent image and is updated for the new name of the script.
@shepazon shepazon requested a review from lkdavies February 9, 2023 20:42
Copy link
Contributor

@ford-at-aws ford-at-aws left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@meyertst-aws meyertst-aws merged commit eac4835 into awsdocs:main Feb 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants