diff --git a/docker/base-image/Dockerfile b/docker/base-image/Dockerfile index a56f451a..38a6c38e 100644 --- a/docker/base-image/Dockerfile +++ b/docker/base-image/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 # set as non-interactive -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive # copy install scripts COPY ./install /app/install @@ -32,17 +32,14 @@ RUN bash /app/install/rod/rod.sh WORKDIR /app/backend # node path -ENV NODE_PATH /usr/lib/node_modules +ENV NODE_PATH=/usr/lib/node_modules # timezone environment -ENV TZ Asia/Shanghai +ENV TZ=Asia/Shanghai # language environment -ENV LC_ALL C.UTF-8 -ENV LANG C.UTF-8 - -# goproxy -ENV GOPROXY goproxy.io,direct +ENV LC_ALL=C.UTF-8 +ENV LANG=C.UTF-8 # frontend port EXPOSE 8080 diff --git a/docker/base-image/install/python/python.sh b/docker/base-image/install/python/python.sh index d7c00c25..31eb9643 100644 --- a/docker/base-image/install/python/python.sh +++ b/docker/base-image/install/python/python.sh @@ -1,15 +1,21 @@ #!/bin/bash -version="3.10" +version="3.12" # install pyenv curl https://pyenv.run | bash # add pyenv to path echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bashrc -echo 'command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc +echo '[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bashrc echo 'eval "$(pyenv init -)"' >> ~/.bashrc -source ~/.bashrc +echo 'eval "$(pyenv virtualenv-init -)"' >> ~/.bashrc + +# ensure changes take effect immediately +export PYENV_ROOT="$HOME/.pyenv" +[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" +eval "$(pyenv virtualenv-init -)" # install python ${version} via pyenv pyenv install ${version}