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.

Sign up for GitHub

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

fix: Temporarily pin emulation image pulls on Windows #5873

Merged
merged 4 commits into from
Sep 1, 2023
Merged

fix: Temporarily pin emulation image pulls on Windows #5873

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56c3a52
fix: Temporarily pin emulation image pulls on Windows
mildaniel Aug 31, 2023
6d6df50
Merge branch 'develop' into pin-windows-emulation
mildaniel Aug 31, 2023
2380567
Use enum value
mildaniel Aug 31, 2023
2ea3e0a
Merge branch 'pin-windows-emulation' of github.com:mildaniel/aws-sam-…
mildaniel Aug 31, 2023
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
5 changes: 5 additions & 0 deletions samcli/local/docker/lambda_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ def build(self, runtime, packagetype, image, layers, architecture, stream=None,
tag_prefix = f"{runtime_only_number}-"
base_image = f"{self._INVOKE_REPO_PREFIX}/{runtime_image_tag}"

# Temporarily add a version tag to the emulation image so that we don't pull a broken image
if platform.system().lower() == "windows" and runtime in [Runtime.go1x.value, Runtime.java8.value]:
LOG.info("Falling back to a previous version of the emulation image")
base_image = f"{base_image}.2023.08.02.10"

if not base_image:
raise InvalidIntermediateImageError(f"Invalid PackageType, PackageType needs to be one of [{ZIP}, {IMAGE}]")

Expand Down