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

Jump to bottom

Use jq's IN() instead of index() #84

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Use jq's IN() instead of index() #84

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions Dockerfile-windows-servercore.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{ def is_3: env.version | startswith("3") -}}
{{ def cmd: if [ "3.8" ] | index(env.version) then "pypy3" else "pypy" end -}}
FROM mcr.microsoft.com/windows/{{ env.windowsVariant }}:{{ env.windowsRelease }}

# $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
Expand Down Expand Up @@ -68,8 +67,8 @@ RUN $url = '{{ .arches["windows-amd64"].url }}'; \
Write-Host 'Renaming ...'; \
Rename-Item -Path C:\{{ .arches["windows-amd64"].url | rtrimstr(".zip") | split("/")[-1] }} -NewName C:\pypy; \
\
Write-Host 'Verifying install ("{{ cmd }} --version") ...'; \
{{ cmd }} --version; \
Write-Host 'Verifying install ("pypy --version") ...'; \
pypy --version; \
\
Write-Host 'Cleanup install ...'; \
Get-ChildItem \
Expand Down Expand Up @@ -100,11 +99,11 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
exit 1; \
}; \
\
$pipVersion = & {{ cmd }} -c 'import ensurepip; print(ensurepip._PIP_VERSION)'; \
$setuptoolsVersion = & {{ cmd }} -c 'import ensurepip; print(ensurepip._SETUPTOOLS_VERSION)'; \
$pipVersion = & pypy -c 'import ensurepip; print(ensurepip._PIP_VERSION)'; \
$setuptoolsVersion = & pypy -c 'import ensurepip; print(ensurepip._SETUPTOOLS_VERSION)'; \
\
Write-Host ('Installing "pip == {0}", "setuptools == {1}" ...' -f $pipVersion, $setuptoolsVersion); \
{{ cmd }} get-pip.py \
pypy get-pip.py \
--disable-pip-version-check \
--no-cache-dir \
('pip == {0}' -f $pipVersion) \
Expand All @@ -131,4 +130,4 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
\
Write-Host 'Complete.'

CMD {{ [ cmd ] | @json }}
CMD ["pypy"]
Loading