Skip to content
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
4 changes: 3 additions & 1 deletion src/anaconda/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ RUN python3 -m pip install \
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-40898
wheel \
# https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-32862
nbconvert
nbconvert \
# https://github.com/devcontainers/images/issues/486
pyOpenssl

# Copy environment.yml (if found) to a temp location so we can update the environment. Also
# copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
Expand Down
3 changes: 2 additions & 1 deletion src/anaconda/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
"future",
"wheel",
"nbconvert",
"py"
"py",
"pyOpenssl"
],
"other": {
"git": {},
Expand Down
3 changes: 3 additions & 0 deletions src/anaconda/test-project/test.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,8 @@ check-version-ge "wheel-requirement" "${wheel_version}" "0.38.1"
nbconvert_version=$(python -c "import nbconvert; print(nbconvert.__version__)")
check-version-ge "nbconvert-requirement" "${nbconvert_version}" "6.5.1"

check "conda-update-conda" bash -c "conda update -y conda"
check "conda-install" bash -c "conda install -c conda-forge --yes tensorflow"

# Report result
reportResults
10 changes: 6 additions & 4 deletions src/miniconda/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,18 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
&& usermod -aG conda ${USERNAME} \
&& apt-get clean -y && rm -rf /var/lib/apt/lists/* /tmp/library-scripts/add-notice.sh

# Temporary: Upgrade 'cryptography' due to https://github.com/advisories/GHSA-39hc-v87j-747x
# 'cryptography' is installed by the base image (continuumio/miniconda3) which does not have the patch.
RUN python3 -m pip install --upgrade cryptography

# Copy environment.yml (if found) to a temp locaition so we update the environment. Also
# copy "noop.txt" so the COPY instruction does not fail if no environment.yml exists.
COPY environment.yml* noop.txt /tmp/conda-tmp/
RUN if [ -f "/tmp/conda-tmp/environment.yml" ]; then umask 0002 && /opt/conda/bin/conda env update -n base -f /tmp/conda-tmp/environment.yml; fi \
&& rm -rf /tmp/conda-tmp

USER vscode

# Temporary: Upgrade 'cryptography' due to https://github.com/advisories/GHSA-39hc-v87j-747x
# 'cryptography' is installed by the base image (continuumio/miniconda3) which does not have the patch.
RUN python3 -m conda update -y cryptography

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>
3 changes: 2 additions & 1 deletion src/miniconda/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
],
"pip": [
"certifi",
"cryptography"
"cryptography",
"pyOpenssl"
],
"other": {
"git": {},
Expand Down
3 changes: 3 additions & 0 deletions src/miniconda/test-project/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,8 @@ check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
cryptography_version=$(python -c "import cryptography; print(cryptography.__version__)")
check-version-ge "cryptography-requirement" "${cryptography_version}" "38.0.3"

check "conda-update-conda" bash -c "conda update -y conda"
check "conda-install" bash -c "conda install -c conda-forge --yes tensorflow"

# Report result
reportResults