From c341ab91d221477dd4e5fc38ab9d1dd6334a326d Mon Sep 17 00:00:00 2001 From: Nelson-He Date: Sat, 8 Oct 2022 16:59:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E22.03=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA;=E4=BD=BF=E7=94=A8yum=20up?= =?UTF-8?q?date=E8=8E=B7=E5=8F=96=E6=9C=80=E6=96=B0=E8=BD=AF=E4=BB=B6?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E4=BF=AE=E5=A4=8DCVE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openeuler/Dockerfile | 3 ++- openeuler/download.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/openeuler/Dockerfile b/openeuler/Dockerfile index 7be3308..03f957d 100644 --- a/openeuler/Dockerfile +++ b/openeuler/Dockerfile @@ -2,5 +2,6 @@ FROM scratch ARG TARGETARCH ADD openEuler-docker-rootfs.$TARGETARCH.tar.xz / # See more in https://gitee.com/openeuler/cloudnative/issues/I482Q6 -RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime +RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime && \ + yum -y update && yum clean all CMD ["bash"] diff --git a/openeuler/download.sh b/openeuler/download.sh index b24efb4..6b9db74 100755 --- a/openeuler/download.sh +++ b/openeuler/download.sh @@ -4,7 +4,7 @@ set -ex archs="x86_64 aarch64" input_version=$1 -versions=${input_version:-"20.03-lts 20.03-lts-sp1 20.03-lts-sp2 20.09 21.03 21.09"} +versions=${input_version:-"20.03-lts 20.03-lts-sp1 20.03-lts-sp2 20.09 21.03 21.09 22.03-lts"} for ARCH in $archs ; do if [[ "$ARCH" = "aarch64" ]];then -- Gitee From ddc627c6075eef3fb85cfb83c4bfe3c629b5908c Mon Sep 17 00:00:00 2001 From: Nelson-He Date: Sat, 8 Oct 2022 19:20:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20.03=E7=89=88=E6=9C=AC=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=B2=A1=E6=9C=89=E9=85=8D=E7=BD=AEyum?= =?UTF-8?q?=E6=BA=90=E5=AF=BC=E8=87=B4update=E5=A4=B1=E8=B4=A5=EF=BC=8C?= =?UTF-8?q?=E5=89=94=E9=99=A420.03=E7=89=88=E6=9C=AC=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/basic-image-push.yml | 2 -- openeuler/Dockerfile | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/basic-image-push.yml b/.github/workflows/basic-image-push.yml index cbbaa4f..a7395e3 100644 --- a/.github/workflows/basic-image-push.yml +++ b/.github/workflows/basic-image-push.yml @@ -13,8 +13,6 @@ jobs: strategy: matrix: include: - - version: 20.03-lts - tags: openeuler/openeuler:20.03-lts - version: 20.03-lts-sp1 tags: openeuler/openeuler:20.03-lts-sp1 - version: 20.03-lts-sp2 diff --git a/openeuler/Dockerfile b/openeuler/Dockerfile index 03f957d..da6d992 100644 --- a/openeuler/Dockerfile +++ b/openeuler/Dockerfile @@ -3,5 +3,6 @@ ARG TARGETARCH ADD openEuler-docker-rootfs.$TARGETARCH.tar.xz / # See more in https://gitee.com/openeuler/cloudnative/issues/I482Q6 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime && \ + sed -i "s/TMOUT=300/TMOUT=0/g" /etc/bashrc && \ yum -y update && yum clean all CMD ["bash"] -- Gitee