Skip to content

Commit 0df15a0

Browse files
committed
update Python version
1 parent 4d83f15 commit 0df15a0

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docker_atom/work/script-setup.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ EOF
5555
setup_conda_with_mamba() {
5656
local PREFIX="${CONDA_PREFIX:-/opt/conda}"
5757
mkdir -pv "${PREFIX}"
58-
VERSION_PYTHON=${1:-"3.10"}; shift 1;
58+
VERSION_PYTHON=${1:-"3.11"}; shift 1;
5959
mamba install -y --root-prefix="${PREFIX}" --prefix="${PREFIX}" -c "conda-forge" conda pip python="${VERSION_PYTHON}"
6060
setup_conda_postprocess
6161
}
@@ -116,7 +116,7 @@ setup_java_base() {
116116
URL_OPENJDK=${JDK_URL_MSFT}
117117
else
118118
echo "ORCA download URL ref: ${JDK_URL_ORCA}"
119-
URL_OPENJDK="https://javadl.oracle.com/webapps/download/GetFile/1.8.0_351-b10/10e8cce67c7843478f41411b7003171c/linux-i586/jdk-8u351-linux-${ARCH}.tar.gz"
119+
URL_OPENJDK="https://javadl.oracle.com/webapps/download/GetFile/1.8.0_361-b09/0ae14417abb444ebb02b9815e2103550/linux-i586/jdk-8u361-linux-${ARCH}.tar.gz"
120120
fi
121121

122122
echo "Installing JDK version ${VER_JDK} from: ${URL_OPENJDK}" \
@@ -155,7 +155,7 @@ setup_R_base() {
155155
&& echo "deb https://cloud.r-project.org/bin/linux/ubuntu $(lsb_release -cs)-cran40/" > /etc/apt/sources.list.d/cran.list \
156156
&& install_apt /opt/utils/install_list_R_base.apt \
157157
&& echo "options(repos=structure(c(CRAN=\"https://cloud.r-project.org\")))" >> /etc/R/Rprofile.site \
158-
&& R -e "install.packages(c('devtools'),clean=T,quiet=T);" \
158+
&& R -e "install.packages(c('devtools'),clean=T,quiet=F);" \
159159
&& ( type java && type R && R CMD javareconf || true ) \
160160
&& echo "@ Version of R: $(R --version)"
161161
}

docker_base/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ARG BASE_IMG="atom"
55
FROM ${BASE_NAMESPACE:+$BASE_NAMESPACE/}${BASE_IMG}
66
LABEL maintainer="haobibo@gmail.com"
77

8-
ARG PYTHON_VERSION="3.10"
8+
ARG PYTHON_VERSION="3.11"
99

1010
ENV CONDA_PREFIX=/opt/conda
1111
ENV PATH=$PATH:${CONDA_PREFIX}/bin

docker_core/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ RUN source /opt/utils/script-utils.sh \
6464
&& for profile in $(echo $ARG_PROFILE_PYTHON | tr "," "\n") ; do ( echo "Pip install for ${profile}" ; install_pip "/opt/utils/install_list_PY_${profile}.pip" ; ) ; done \
6565
# Handle tensorflow installation 1.x/2.x, cpu/gpu: https://www.tensorflow.org/install/source#gpu
6666
&& ( $(grep -q "tf" <<< "${ARG_PROFILE_PYTHON}") && ( \
67-
TF=$( [ -x "$(command -v nvcc)" ] && echo "tensorflow-gpu" || echo "tensorflow") \
68-
&& V=$($(grep -q "tf1" <<< "${ARG_PROFILE_PYTHON}") && echo "1" || echo "2" ) \
67+
V=$($(grep -q "tf1" <<< "${ARG_PROFILE_PYTHON}") && echo "1" || echo "2" ) \
68+
TF=$( [ "$V" == "1" ] && echo "tensorflow-gpu" || echo "tensorflow") \
6969
&& pip install --pre -U "${TF}==${V}.*" \
7070
) || echo "Skip tf install" ) \
7171
# Handle pytorch installation 1.x only, cpu/gpu: https://pytorch.org/get-started/locally/
7272
&& ( $(grep -q "torch" <<< "${ARG_PROFILE_PYTHON}") && ( \
7373
CUDA_VER=$(echo "${CUDA_VERSION:0:4}" | sed 's/\.//' ) \
74-
&& IDX=$( [ -x "$(command -v nvcc)" ] && echo "cu${CUDA_VER:-113}" || echo "cpu" ) \
74+
&& IDX=$( [ -x "$(command -v nvcc)" ] && echo "cu${CUDA_VER:-116}" || echo "cpu" ) \
7575
&& pip install --pre -U torch -f "https://download.pytorch.org/whl/${IDX}/torch_stable.html" \
7676
) || echo "Skip pytorch install" ) \
7777
# Handle paddle installation, cpu/gpu: https://www.paddlepaddle.org.cn/

0 commit comments

Comments
 (0)