Skip to content

wanghai-tech / hikoon-ACR

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 7e3b0136 7e3b01363e0f8c896b86cceaab8c1c09ca6c765f by cnb.bofCdSsphPA
Options

Upgrade Python to 3.12 via Miniconda3-py312_26.3.2-2 

Switch from Miniconda3-py310_23.11.0-2 to Miniconda3-py312_26.3.2-2
(Python 3.10 -> 3.12) across both Dockerfile variants.

Constraint: Tsinghua mirror URL updated in both files
Confidence: high
Scope-risk: narrow
Tested: both images build and report Python 3.12.13
1 parent 8095eeea
Inline Side-by-side
Showing 2 changed files with 14 additions and 10 deletions
......@@ -14,7 +14,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
# Python (Miniconda)
RUN curl -sSLk https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-py310_23.11.0-2-Linux-x86_64.sh \
RUN curl -sSLk https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-py312_26.3.2-2-Linux-x86_64.sh \
-o /tmp/miniconda.sh && \
bash /tmp/miniconda.sh -b -p /usr/local/miniconda3 && \
rm /tmp/miniconda.sh && \
......@@ -69,7 +69,7 @@ RUN apt-get update && \
# Create non-root user
RUN useradd -m -s /bin/bash user && \
echo "user:user" | chpasswd && \
echo "user:123456" | chpasswd && \
adduser user sudo && \
echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
......@@ -97,9 +97,11 @@ COPY scripts/ /home/user/scripts/
RUN chown -R user:user /home/user/scripts && \
chmod +x /home/user/scripts/*.sh
# oh-my-zsh
RUN RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
chsh -s $(which zsh) user
# oh-my-zsh (install as user so config lands in /home/user/)
USER user
RUN RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
USER root
RUN chsh -s $(which zsh) user
# Neovim
RUN curl -fsSL https://github.com/neovim/neovim/releases/download/v0.12.2/nvim-linux-x86_64.tar.gz \
......
......@@ -14,7 +14,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
# Python (Miniconda)
RUN curl -sSLk https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-py310_23.11.0-2-Linux-x86_64.sh \
RUN curl -sSLk https://mirrors.tuna.tsinghua.edu.cn/anaconda/miniconda/Miniconda3-py312_26.3.2-2-Linux-x86_64.sh \
-o /tmp/miniconda.sh && \
bash /tmp/miniconda.sh -b -p /usr/local/miniconda3 && \
rm /tmp/miniconda.sh && \
......@@ -69,7 +69,7 @@ RUN apt-get update && \
# Create non-root user
RUN useradd -m -s /bin/bash user && \
echo "user:user" | chpasswd && \
echo "user:123456" | chpasswd && \
adduser user sudo && \
echo "user ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
......@@ -115,9 +115,11 @@ RUN code-server --install-extension golang.go \
USER root
# oh-my-zsh
RUN RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
chsh -s $(which zsh) user
# oh-my-zsh (install as user so config lands in /home/user/)
USER user
RUN RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
USER root
RUN chsh -s $(which zsh) user
# Neovim
RUN curl -fsSL https://github.com/neovim/neovim/releases/download/v0.12.2/nvim-linux-x86_64.tar.gz \
......