matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

sonic-slave-buster pins the versions of Jinja2 and MarkupSafe in py3 (#10043)

Browse Source 
#### Why I did it
Upstream breaking change, ref discussion https://github.com/pallets/markupsafe/issues/282
This commit is contained in:
Qi Luo 2022-02-24 17:00:13 -08:00 committed by GitHub
parent b101b023d3
commit c9cf4d9ff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.azure-pipelines/azure-pipelines-image-template.yml
View File

@ -43,7 +43,6 @@ jobs:
[ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER" [ -n "$SYSTEM_PULLREQUEST_PULLREQUESTID" ] && BRANCH_NAME="$SYSTEM_PULLREQUEST_TARGETBRANCH-$SYSTEM_PULLREQUEST_PULLREQUESTNUMBER"
git checkout -b $BRANCH_NAME git checkout -b $BRANCH_NAME
sudo modprobe overlay sudo modprobe overlay
pip3 install MarkupSafe==2.0.1 --force-reinstall
sudo apt-get install -y acl sudo apt-get install -y acl
sudo bash -c "echo 1 > /proc/sys/vm/compact_memory" sudo bash -c "echo 1 > /proc/sys/vm/compact_memory"
ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure ENABLE_DOCKER_BASE_PULL=y make PLATFORM=$(PLATFORM_AZP) PLATFORM_ARCH=$(PLATFORM_ARCH) $(BUILD_OPTIONS) configure

5
sonic-slave-buster/Dockerfile.j2
View File

@ -465,6 +465,11 @@ RUN pip3 uninstall -y enum34
# For templating # For templating
RUN pip2 install j2cli==0.3.10 RUN pip2 install j2cli==0.3.10
# Note: Jinja2 depends on MarkupSafe, however markupsafe 2.1.0 breaks Jinja2 2.10
# Debian buster dist-packages include python3-markupsafe (1.1.0-1) and python3-jinja2 (2.10-2)
# If not pinning the versions, any requirement like `MarkupSafe>=2.0` will pull latest into site-packages and mess up.
RUN pip3 install MarkupSafe==2.0.1
RUN pip3 install Jinja2==3.0.3
# For sonic-mgmt-framework # For sonic-mgmt-framework
RUN pip2 install "PyYAML==5.4.1" RUN pip2 install "PyYAML==5.4.1"