diff --git a/.circleci/config.yml b/.circleci/config.yml index a1f09e7..9a56913 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,10 +1,10 @@ jobs: build-branches-amd64: environment: - KUBE_VERSION: '1.29.2' + KUBE_VERSION: '1.29.3' DOCKER_VERSION: '25.0.3-1' CRIO_MAJOR_VERSION: '1.29' - CRIO_VERSION: '1.29.2' + CRIO_VERSION: '1.29.3' machine: true steps: - checkout @@ -14,13 +14,14 @@ jobs: sudo mkdir ${PWD}/rpms docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes.repo:/root/kubernetes.repo -v ${PWD}/cri-o.repo:/root/cri-o.repo \ -v ${PWD}/CentOS8.repo:/root/CentOS8.repo -v ${PWD}/docker-ce.repo:/root/docker-ce.repo openeuler/openeuler:22.03-lts-sp3 bash -c \ - "mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ + "yum remove -y tar && \ + mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ yum install -y createrepo && \ mkdir -p /rpms/base/centos8 && \ mkdir -p /rpms/k8s/centos8 && \ mkdir -p /rpms/crio/centos8 && \ mkdir -p /rpms/docker/centos8 && \ - yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ + yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar libselinux-python3 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ cp /root/kubernetes.repo /etc/yum.repos.d/ && \ yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} && \ rm -f /etc/yum.repos.d/*.repo && cp /root/cri-o.repo /root/default-repo/*.repo /etc/yum.repos.d/ && \ @@ -38,10 +39,10 @@ jobs: build-tags-amd64: environment: - KUBE_VERSION: '1.29.2' + KUBE_VERSION: '1.29.3' DOCKER_VERSION: '25.0.3-1' CRIO_MAJOR_VERSION: '1.29' - CRIO_VERSION: '1.29.2' + CRIO_VERSION: '1.29.3' machine: true steps: - checkout @@ -51,13 +52,14 @@ jobs: sudo mkdir ${PWD}/rpms docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes.repo:/root/kubernetes.repo -v ${PWD}/cri-o.repo:/root/cri-o.repo \ -v ${PWD}/CentOS8.repo:/root/CentOS8.repo -v ${PWD}/docker-ce.repo:/root/docker-ce.repo openeuler/openeuler:22.03-lts-sp3 bash -c \ - "mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ + "yum remove -y tar && \ + mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ yum install -y createrepo && \ mkdir -p /rpms/base/centos8 && \ mkdir -p /rpms/k8s/centos8 && \ mkdir -p /rpms/crio/centos8 && \ mkdir -p /rpms/docker/centos8 && \ - yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ + yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar libselinux-python3 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ cp /root/kubernetes.repo /etc/yum.repos.d/ && \ yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} && \ rm -f /etc/yum.repos.d/*.repo && cp /root/cri-o.repo /root/default-repo/*.repo /etc/yum.repos.d/ && \ @@ -75,10 +77,10 @@ jobs: build-branches-aarch64: environment: - KUBE_VERSION: '1.29.2' + KUBE_VERSION: '1.29.3' DOCKER_VERSION: '25.0.3-1' CRIO_MAJOR_VERSION: '1.29' - CRIO_VERSION: '1.29.2' + CRIO_VERSION: '1.29.3' machine: true resource_class: arm.medium steps: @@ -89,13 +91,14 @@ jobs: sudo mkdir ${PWD}/rpms docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes.repo:/root/kubernetes.repo -v ${PWD}/cri-o.repo:/root/cri-o.repo \ -v ${PWD}/CentOS8.repo:/root/CentOS8.repo -v ${PWD}/docker-ce.repo:/root/docker-ce.repo openeuler/openeuler:22.03-lts-sp3 bash -c \ - "mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ + "yum remove -y tar && \ + mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ yum install -y createrepo && \ mkdir -p /rpms/base/centos8 && \ mkdir -p /rpms/k8s/centos8 && \ mkdir -p /rpms/crio/centos8 && \ mkdir -p /rpms/docker/centos8 && \ - yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ + yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar libselinux-python3 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ cp /root/kubernetes.repo /etc/yum.repos.d/ && \ yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} && \ rm -f /etc/yum.repos.d/*.repo && cp /root/cri-o.repo /root/default-repo/*.repo /etc/yum.repos.d/ && \ @@ -113,10 +116,10 @@ jobs: build-tags-aarch64: environment: - KUBE_VERSION: '1.29.2' + KUBE_VERSION: '1.29.3' DOCKER_VERSION: '25.0.3-1' CRIO_MAJOR_VERSION: '1.29' - CRIO_VERSION: '1.29.2' + CRIO_VERSION: '1.29.3' machine: true resource_class: arm.medium steps: @@ -127,13 +130,14 @@ jobs: sudo mkdir ${PWD}/rpms docker run -t --rm -v ${PWD}/rpms:/rpms -v ${PWD}/kubernetes.repo:/root/kubernetes.repo -v ${PWD}/cri-o.repo:/root/cri-o.repo \ -v ${PWD}/CentOS8.repo:/root/CentOS8.repo -v ${PWD}/docker-ce.repo:/root/docker-ce.repo openeuler/openeuler:22.03-lts-sp3 bash -c \ - "mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ + "yum remove -y tar && \ + mkdir /root/default-repo && cp /etc/yum.repos.d/*.repo /root/default-repo/ && \ yum install -y createrepo && \ mkdir -p /rpms/base/centos8 && \ mkdir -p /rpms/k8s/centos8 && \ mkdir -p /rpms/crio/centos8 && \ mkdir -p /rpms/docker/centos8 && \ - yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ + yum -y install --downloadonly --downloaddir=/rpms/base/centos8 tar libselinux-python3 chrony audit rsync jq git tcpdump nc bind-utils net-tools ipvsadm graphviz nfs-utils && \ cp /root/kubernetes.repo /etc/yum.repos.d/ && \ yum -y install --downloadonly --downloaddir=/rpms/k8s/centos8 kubectl-${KUBE_VERSION} kubelet-${KUBE_VERSION} kubeadm-${KUBE_VERSION} && \ rm -f /etc/yum.repos.d/*.repo && cp /root/cri-o.repo /root/default-repo/*.repo /etc/yum.repos.d/ && \ diff --git a/README.md b/README.md index cba6d83..3b209a8 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Wise2C Yum Repo for Docker/K8S/Ceph/NFS installation YUM Repo服务器安装好docker,直接运行命令: -docker run -d -p 2009:2009 --name=yum-repo wise2c/yum-repo:v1.29.2-openeuler-2203 +docker run -d -p 2009:2009 --name=yum-repo wise2c/yum-repo:v1.29.3-openeuler-2203 在需要安装docker/k8s/ceph/nfs的其它主机上: