Skip to content

Commit daa2ae2

Browse files
authored
release: v3.2.2 (#763)
2 parents 7c9cd5e + 0529690 commit daa2ae2

File tree

79 files changed

+8296
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+8296
-0
lines changed

build_artifacts/v3/v3.2/v3.2.1/cpu.env.out

Lines changed: 781 additions & 0 deletions
Large diffs are not rendered by default.

build_artifacts/v3/v3.2/v3.2.1/gpu.env.out

Lines changed: 873 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Change log: 3.2.2(cpu)
2+
3+
## Upgrades:
4+
5+
Package | Previous Version | Current Version
6+
---|---|---
7+
sagemaker-code-editor|1.5.0|1.5.1
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Change log: 3.2.2(gpu)
2+
3+
## Upgrades:
4+
5+
Package | Previous Version | Current Version
6+
---|---|---
7+
sagemaker-code-editor|1.5.0|1.5.1
Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
ARG TAG_FOR_BASE_MICROMAMBA_IMAGE
2+
FROM mambaorg/micromamba:$TAG_FOR_BASE_MICROMAMBA_IMAGE
3+
4+
ARG CUDA_MAJOR_MINOR_VERSION=''
5+
ARG ENV_IN_FILENAME
6+
ARG PINNED_ENV_IN_FILENAME
7+
ARG ARG_BASED_ENV_IN_FILENAME
8+
ARG IMAGE_VERSION
9+
LABEL "org.amazon.sagemaker-distribution.image.version"=$IMAGE_VERSION
10+
11+
ARG AMZN_BASE="/opt/amazon/sagemaker"
12+
ARG DB_ROOT_DIR="/opt/db"
13+
ARG DIRECTORY_TREE_STAGE_DIR="${AMZN_BASE}/dir-staging"
14+
15+
ARG NB_USER="sagemaker-user"
16+
ARG NB_UID=1000
17+
ARG NB_GID=100
18+
19+
# https://www.openssl.org/source/
20+
ARG FIPS_VALIDATED_SSL=3.0.8
21+
ARG MIN_REQUIRED_MICROMAMBA_VERSION=1.5.11
22+
23+
ENV SAGEMAKER_LOGGING_DIR="/var/log/sagemaker/"
24+
ENV STUDIO_LOGGING_DIR="/var/log/studio/"
25+
ENV EDITOR="nano"
26+
ENV IMAGE_VERSION=$IMAGE_VERSION
27+
ENV PINNED_MICROMAMBA_MINOR_VERSION="1.5.*"
28+
ENV SAGEMAKER_RECOVERY_MODE_HOME=/tmp/sagemaker-recovery-mode-home
29+
30+
USER root
31+
# Upgrade micromamba to the latest patch version in the pinned minor version range, if applicable
32+
RUN CURRENT_MICROMAMBA_VERSION=$(micromamba --version) && \
33+
echo "Current micromamba version: $CURRENT_MICROMAMBA_VERSION" && \
34+
if [[ "$CURRENT_MICROMAMBA_VERSION" == $PINNED_MICROMAMBA_MINOR_VERSION ]]; then \
35+
echo "Upgrading micromamba to the latest $PINNED_MICROMAMBA_MINOR_VERSION version..." && \
36+
micromamba self-update -c conda-forge --version "$MIN_REQUIRED_MICROMAMBA_VERSION" && \
37+
micromamba clean --all --yes --force-pkgs-dirs; \
38+
else \
39+
echo "Micromamba is already at version $CURRENT_MICROMAMBA_VERSION (outside $PINNED_MICROMAMBA_MINOR_VERSION). No upgrade performed."; \
40+
fi
41+
42+
RUN usermod "--login=${NB_USER}" "--home=/home/${NB_USER}" --move-home "-u ${NB_UID}" "${MAMBA_USER}" && \
43+
groupmod "--new-name=${NB_USER}" --non-unique "-g ${NB_GID}" "${MAMBA_USER}" && \
44+
# Update the expected value of MAMBA_USER for the
45+
# _entrypoint.sh consistency check.
46+
echo "${NB_USER}" > "/etc/arg_mamba_user" && \
47+
:
48+
ENV MAMBA_USER=$NB_USER
49+
ENV USER=$NB_USER
50+
51+
RUN apt-get update && apt-get upgrade -y && \
52+
apt-get install -y --no-install-recommends sudo gettext-base wget curl unzip git rsync build-essential openssh-client nano cron less mandoc jq ca-certificates gnupg && \
53+
# We just install tzdata below but leave default time zone as UTC. This helps packages like Pandas to function correctly.
54+
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends tzdata krb5-user libkrb5-dev libsasl2-dev libsasl2-modules && \
55+
chmod g+w /etc/passwd && \
56+
echo "ALL ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \
57+
touch /etc/krb5.conf.lock && chown ${NB_USER}:${MAMBA_USER} /etc/krb5.conf* && \
58+
# Note that we do NOT run `rm -rf /var/lib/apt/lists/*` here. If we did, anyone building on top of our images will
59+
# not be able to run any `apt-get install` commands and that would hamper customizability of the images.
60+
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
61+
unzip awscliv2.zip && \
62+
sudo ./aws/install && \
63+
rm -rf aws awscliv2.zip && \
64+
: && \
65+
echo "source /usr/local/bin/_activate_current_env.sh" | tee --append /etc/profile && \
66+
# CodeEditor - create server, user data dirs
67+
mkdir -p /opt/amazon/sagemaker/sagemaker-code-editor-server-data /opt/amazon/sagemaker/sagemaker-code-editor-user-data \
68+
&& chown $MAMBA_USER:$MAMBA_USER /opt/amazon/sagemaker/sagemaker-code-editor-server-data /opt/amazon/sagemaker/sagemaker-code-editor-user-data && \
69+
# create dir to store user data files
70+
mkdir -p /opt/amazon/sagemaker/user-data \
71+
&& chown $MAMBA_USER:$MAMBA_USER /opt/amazon/sagemaker/user-data && \
72+
# Merge in OS directory tree contents.
73+
mkdir -p ${DIRECTORY_TREE_STAGE_DIR}
74+
COPY dirs/ ${DIRECTORY_TREE_STAGE_DIR}/
75+
RUN rsync -a ${DIRECTORY_TREE_STAGE_DIR}/ / && \
76+
rm -rf ${DIRECTORY_TREE_STAGE_DIR} && \
77+
# CodeEditor - download the extensions
78+
mkdir -p /etc/code-editor/extensions && \
79+
while IFS= read -r url || [ -n "$url" ]; do \
80+
echo "Downloading extension from ${url}..." && \
81+
wget --no-check-certificate -P /etc/code-editor/extensions "${url}"; \
82+
done < /etc/code-editor/extensions.txt
83+
84+
USER $MAMBA_USER
85+
COPY --chown=$MAMBA_USER:$MAMBA_USER $ENV_IN_FILENAME *.in /tmp/
86+
COPY --chown=$MAMBA_USER:$MAMBA_USER $PINNED_ENV_IN_FILENAME *.in /tmp/
87+
88+
ARG MAMBA_DOCKERFILE_ACTIVATE=1
89+
ARG CONDA_OVERRIDE_CUDA=$CUDA_MAJOR_MINOR_VERSION
90+
91+
# Make sure that $ENV_IN_FILENAME and $PINNED_ENV_IN_FILENAME has a newline at the end before the `tee` command runs.
92+
# Otherwise, nasty things will happen.
93+
RUN if [[ -z $ARG_BASED_ENV_IN_FILENAME ]] ; \
94+
then echo 'No ARG_BASED_ENV_IN_FILENAME passed' ; \
95+
else envsubst < /tmp/$ARG_BASED_ENV_IN_FILENAME | tee --append /tmp/$ENV_IN_FILENAME ; \
96+
fi && \
97+
# Enforce dependencies are all installed from conda-forge
98+
micromamba install -y --name base --file /tmp/$ENV_IN_FILENAME --file /tmp/$PINNED_ENV_IN_FILENAME && \
99+
mkdir -p $SAGEMAKER_RECOVERY_MODE_HOME && \
100+
chown $MAMBA_USER:$MAMBA_USER $SAGEMAKER_RECOVERY_MODE_HOME && \
101+
SUPERVISOR_VERSION="supervisor==4.2.5" && \
102+
JUPYTERLAB_VERSION="jupyterlab==4.4.3" && \
103+
SAGEMAKER_JUPYTERLAB_VERSION="sagemaker-jupyterlab-extension==0.4.2" && \
104+
echo "Installing in sagemaker-recovery-mode micromamba environment: $JUPYTERLAB_VERSION $SAGEMAKER_JUPYTERLAB_VERSION" && \
105+
micromamba create --prefix /opt/conda/envs/sagemaker-recovery-mode && \
106+
micromamba install -c conda-forge --prefix /opt/conda/envs/sagemaker-recovery-mode -y $JUPYTERLAB_VERSION $SAGEMAKER_JUPYTERLAB_VERSION $SUPERVISOR_VERSION && \
107+
micromamba clean --all --yes --force-pkgs-dirs && \
108+
rm -rf /tmp/*.in && \
109+
sudo ln -s $(which python3) /usr/bin/python && \
110+
# Update npm version
111+
npm i -g npm && \
112+
# Enforce to use `conda-forge` as only channel, by removing `defaults`
113+
conda config --remove channels defaults && \
114+
micromamba config append channels conda-forge --env && \
115+
# Configure CodeEditor - Install extensions and set preferences
116+
extensionloc=/opt/amazon/sagemaker/sagemaker-code-editor-server-data/extensions && mkdir -p "${extensionloc}" \
117+
# Loop through all vsix files in /etc/code-editor/extensions and install them
118+
&& for ext in /etc/code-editor/extensions/*.vsix; do \
119+
echo "Installing extension ${ext}..."; \
120+
sagemaker-code-editor --install-extension "${ext}" --extensions-dir "${extensionloc}" --server-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-server-data --user-data-dir /opt/amazon/sagemaker/sagemaker-code-editor-user-data; \
121+
done \
122+
# Copy the settings
123+
&& cp /etc/code-editor/code_editor_machine_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/Machine/settings.json && \
124+
cp /etc/code-editor/code_editor_user_settings.json /opt/amazon/sagemaker/sagemaker-code-editor-server-data/data/User/settings.json && \
125+
# Install glue kernels, and move to shared directory
126+
# Also patching base kernel so Studio background code doesn't start session silently
127+
install-glue-kernels && \
128+
SITE_PACKAGES=$(pip show aws-glue-sessions | grep Location | awk '{print $2}') && \
129+
jupyter-kernelspec install $SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_pyspark --user && \
130+
jupyter-kernelspec install $SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_spark --user && \
131+
mv /home/sagemaker-user/.local/share/jupyter/kernels/glue_pyspark /opt/conda/share/jupyter/kernels && \
132+
mv /home/sagemaker-user/.local/share/jupyter/kernels/glue_spark /opt/conda/share/jupyter/kernels && \
133+
sed -i '/if not store_history and (/i\ if "sm_analytics_runtime_check" in code:\n return await self._complete_cell()\n' \
134+
"$SITE_PACKAGES/aws_glue_interactive_sessions_kernel/glue_kernel_base/BaseKernel.py" && \
135+
# Install FIPS Provider for OpenSSL, on top of existing OpenSSL installation
136+
# v3.0.8 is latest FIPS validated provider, so this is the one we install
137+
# But we need to run tests against the installed version.
138+
# see https://github.com/openssl/openssl/blob/master/README-FIPS.md https://www.openssl.org/source/
139+
INSTALLED_SSL=$(micromamba list | grep openssl | tr -s ' ' | cut -d ' ' -f 3 | head -n 1) && \
140+
# download source code for installed, and FIPS validated openssl versions
141+
curl -L https://github.com/openssl/openssl/releases/download/openssl-$FIPS_VALIDATED_SSL/openssl-$FIPS_VALIDATED_SSL.tar.gz > openssl-$FIPS_VALIDATED_SSL.tar.gz && \
142+
curl -L https://github.com/openssl/openssl/releases/download/openssl-$INSTALLED_SSL/openssl-$INSTALLED_SSL.tar.gz > openssl-$INSTALLED_SSL.tar.gz && \
143+
tar -xf openssl-$FIPS_VALIDATED_SSL.tar.gz && tar -xf openssl-$INSTALLED_SSL.tar.gz && cd openssl-$FIPS_VALIDATED_SSL && \
144+
# Configure both versions to enable FIPS and build
145+
./Configure enable-fips --prefix=/opt/conda --openssldir=/opt/conda/ssl && make && \
146+
cd ../openssl-$INSTALLED_SSL && \
147+
./Configure enable-fips --prefix=/opt/conda --openssldir=/opt/conda/ssl && make && \
148+
# Copy validated provider to installed version for testing
149+
cp ../openssl-$FIPS_VALIDATED_SSL/providers/fips.so providers/. && \
150+
cp ../openssl-$FIPS_VALIDATED_SSL/providers/fipsmodule.cnf providers/. && \
151+
make tests && cd ../openssl-$FIPS_VALIDATED_SSL && \
152+
# After tests pass, install FIPS provider and remove source code
153+
make install_fips && cd .. && rm -rf ./openssl-* && \
154+
# Create new config file with fips-enabled. Then user can override OPENSSL_CONF to enable FIPS
155+
# e.g. export OPENSSL_CONF=/opt/conda/ssl/openssl-fips.cnf
156+
cp /opt/conda/ssl/openssl.cnf /opt/conda/ssl/openssl-fips.cnf && \
157+
sed -i "s:# .include fipsmodule.cnf:.include /opt/conda/ssl/fipsmodule.cnf:" /opt/conda/ssl/openssl-fips.cnf && \
158+
sed -i 's:# fips = fips_sect:fips = fips_sect:' /opt/conda/ssl/openssl-fips.cnf && \
159+
# Install Kerberos.
160+
# Make sure no dependency is added/updated
161+
pip install "krb5>=0.5.1,<0.6" && \
162+
pip show krb5 | grep Require | xargs -i sh -c '[ $(echo {} | cut -d: -f2 | wc -w) -eq 0 ] ' && \
163+
# https://stackoverflow.com/questions/122327
164+
SYSTEM_PYTHON_PATH=$(python3 -c "from __future__ import print_function;import sysconfig; print(sysconfig.get_paths().get('purelib'))") && \
165+
# Remove SparkRKernel as it's not supported \
166+
jupyter-kernelspec remove -f -y sparkrkernel && \
167+
# Patch Sparkmagic lib to support Custom Certificates \
168+
# https://github.com/jupyter-incubator/sparkmagic/pull/435/files \
169+
cp -a ${SYSTEM_PYTHON_PATH}/sagemaker_studio_analytics_extension/patches/configuration.py ${SYSTEM_PYTHON_PATH}/sparkmagic/utils/ && \
170+
cp -a ${SYSTEM_PYTHON_PATH}/sagemaker_studio_analytics_extension/patches/reliablehttpclient.py ${SYSTEM_PYTHON_PATH}/sparkmagic/livyclientlib/reliablehttpclient.py && \
171+
sed -i 's= "python"= "/opt/conda/bin/python"=g' /opt/conda/share/jupyter/kernels/pysparkkernel/kernel.json /opt/conda/share/jupyter/kernels/sparkkernel/kernel.json && \
172+
sed -i 's="Spark"="SparkMagic Spark"=g' /opt/conda/share/jupyter/kernels/sparkkernel/kernel.json && \
173+
sed -i 's="PySpark"="SparkMagic PySpark"=g' /opt/conda/share/jupyter/kernels/pysparkkernel/kernel.json && \
174+
# Configure RTC - disable jupyter_collaboration by default
175+
jupyter labextension disable @jupyter/collaboration-extension && \
176+
# Disable docprovider-extension for v3 and above images
177+
jupyter labextension disable @jupyter/docprovider-extension
178+
179+
# Patch glue kernels to use kernel wrapper
180+
COPY patch_glue_pyspark.json /opt/conda/share/jupyter/kernels/glue_pyspark/kernel.json
181+
COPY patch_glue_spark.json /opt/conda/share/jupyter/kernels/glue_spark/kernel.json
182+
183+
USER root
184+
185+
# Create logging directories for supervisor
186+
RUN mkdir -p $SAGEMAKER_LOGGING_DIR && \
187+
chmod a+rw $SAGEMAKER_LOGGING_DIR && \
188+
mkdir -p ${STUDIO_LOGGING_DIR} && \
189+
chown ${NB_USER}:${MAMBA_USER} ${STUDIO_LOGGING_DIR} && \
190+
# Create sagemaker pysdk admin default config directory
191+
mkdir -p /etc/xdg/sagemaker && \
192+
chmod a+rw /etc/xdg/sagemaker && \
193+
# Clean up CodeEditor artifacts
194+
rm -rf /etc/code-editor && \
195+
# Create supervisord runtime directory
196+
mkdir -p /var/run/supervisord && \
197+
chmod a+rw /var/run/supervisord && \
198+
# Create root directory for DB
199+
# Create logging directories for supervisor
200+
mkdir -p $DB_ROOT_DIR && \
201+
chmod a+rw $DB_ROOT_DIR && \
202+
HOME_DIR="/home/${NB_USER}/licenses" \
203+
&& mkdir -p ${HOME_DIR} \
204+
&& curl -o ${HOME_DIR}/oss_compliance.zip https://aws-dlinfra-utilities.s3.amazonaws.com/oss_compliance.zip \
205+
&& unzip ${HOME_DIR}/oss_compliance.zip -d ${HOME_DIR}/ \
206+
&& cp ${HOME_DIR}/oss_compliance/test/testOSSCompliance /usr/local/bin/testOSSCompliance \
207+
&& chmod +x /usr/local/bin/testOSSCompliance \
208+
&& chmod +x ${HOME_DIR}/oss_compliance/generate_oss_compliance.sh \
209+
&& ${HOME_DIR}/oss_compliance/generate_oss_compliance.sh ${HOME_DIR} python \
210+
&& rm -rf ${HOME_DIR}/oss_compliance*
211+
212+
# Explicitly disable BuildKit for SM Studio Docker functionality
213+
ENV DOCKER_BUILDKIT=0
214+
ENV PATH="/etc/sagemaker-inference-server:/opt/conda/bin:/opt/conda/condabin:$PATH"
215+
WORKDIR "/home/${NB_USER}"
216+
ENV SHELL=/bin/bash
217+
ENV OPENSSL_MODULES=/opt/conda/lib64/ossl-modules/
218+
USER $MAMBA_USER

0 commit comments

Comments
 (0)