refactor: 移除子镜像中无效的时区设置与 yum 换源命令
- ALinux3 官方源已使用 mirrors.aliyun.com,sed 换源为空操作 - 时区已由 ENV TimeZone 控制,/etc/localtime 运行时被宿主机覆盖 - 同步更新 VULNERABILITY_FIX.md 示例
This commit is contained in:
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-6.0.427-linux-x64-binaries
|
||||
ADD https://download.visualstudio.microsoft.com/download/pr/12ee34e8-640c-400e-a6dc-4892b442df92/81d40fc98a5bbbfbafa4cc1ab86d6288/dotnet-sdk-6.0.427-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-8.0.403-linux-x64-binaries
|
||||
ADD https://download.visualstudio.microsoft.com/download/pr/ca6cd525-677e-4d3a-b66c-11348a6f920a/ec395f498f89d0ca4d67d903892af82d/dotnet-sdk-8.0.403-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/sdk-9.0.100-rc.2-linux-x64-binaries
|
||||
ADD https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.100-rc.2.24474.11/dotnet-sdk-9.0.100-rc.2.24474.11-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -5,9 +5,7 @@ ENV JAVA_HOME=/usr/local/java
|
||||
ENV PATH="${JAVA_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
ADD jdk-11.0.2.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
tar \
|
||||
wget \
|
||||
net-tools \
|
||||
|
||||
@@ -5,9 +5,7 @@ ENV JAVA_HOME=/usr/local/java
|
||||
ENV PATH="${JAVA_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
ADD jdk-17.0.2.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
tar \
|
||||
wget \
|
||||
net-tools \
|
||||
|
||||
@@ -5,9 +5,7 @@ ENV JAVA_HOME=/usr/local/java
|
||||
ENV PATH="${JAVA_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
ADD jdk-21.0.2.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
tar \
|
||||
wget \
|
||||
net-tools \
|
||||
|
||||
@@ -5,9 +5,7 @@ ENV PYTHON_HOME=/usr/local/python3
|
||||
ENV PATH="${PYTHON_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
ADD https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-6.0.35-linux-x64-binaries
|
||||
ADD https://download.visualstudio.microsoft.com/download/pr/ccdb3628-8f55-411b-b0f1-669d42604ad8/81283ab8762aaab1be72772711f07f86/aspnetcore-runtime-6.0.35-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-8.0.10-linux-x64-binaries
|
||||
ADD https://download.visualstudio.microsoft.com/download/pr/6d143cf6-e215-428e-bcde-9fd50ea0e1be/99652e31b3e0161a3f1f933e0bedf223/aspnetcore-runtime-8.0.10-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -6,9 +6,7 @@ ENV PATH="${DOTNET_HOME}:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-aspnetcore-9.0.0-rc.2-linux-x64-binaries
|
||||
ADD https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.0-rc.2.24474.3/aspnetcore-runtime-9.0.0-rc.2.24474.3-linux-x64.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -5,9 +5,7 @@ ENV PYTHON_HOME=/usr/local/python3
|
||||
ENV PATH="${PYTHON_HOME}/bin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
ADD https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tgz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
libffi-devel \
|
||||
zlib-devel \
|
||||
bzip2-devel \
|
||||
|
||||
@@ -7,9 +7,7 @@ ENV PATH="${NGINX_HOME}/sbin:$PATH"
|
||||
WORKDIR /home/admin
|
||||
# https://tengine.taobao.org/download/tengine-3.1.0.tar.gz
|
||||
ADD https://tengine.taobao.org/download/tengine-${TENGINE_VERSION}.tar.gz ./
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum install \
|
||||
RUN yum install \
|
||||
gcc \
|
||||
gcc-c++ \
|
||||
make \
|
||||
|
||||
+1
-3
@@ -9,7 +9,5 @@ WORKDIR /home/admin
|
||||
# wget \
|
||||
# net-tools \
|
||||
# bind-utils -y;
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum update -y && yum clean all; \
|
||||
RUN yum update -y && yum clean all; \
|
||||
rm -rf /usr/lib/python3.6;
|
||||
|
||||
@@ -80,11 +80,14 @@ LABEL MAINTAINER="tianjun@odboy.cn"
|
||||
ENV TimeZone=Asia/Shanghai
|
||||
WORKDIR /home/admin
|
||||
|
||||
RUN ln -snf /usr/share/zoneinfo/$TimeZone /etc/localtime && echo $TimeZone > /etc/timezone; \
|
||||
sed -i 's/mirrors.cloud.aliyuncs.com/mirrors.aliyun.com/' /etc/yum.repos.d/*.repo; \
|
||||
yum update -y && yum clean all
|
||||
RUN yum update -y && yum clean all; \
|
||||
rm -rf /usr/lib/python3.6
|
||||
```
|
||||
|
||||
> 说明:ALinux3 官方镜像的 repo 已使用 `mirrors.aliyun.com`,不需要再做 `mirrors.cloud.aliyuncs.com` 换源;
|
||||
> 时区由 `ENV TimeZone` 控制,运行时通常会被容器引擎挂载的宿主机 `/etc/localtime` 覆盖,
|
||||
> 因此子镜像也不再重复 `ln -snf ... /etc/localtime`。
|
||||
|
||||
然后执行构建:
|
||||
|
||||
```bash
|
||||
|
||||
Reference in New Issue
Block a user