diff --git a/context/docker/rootfs/scripts/docker.sh b/context/docker/rootfs/scripts/docker.sh index 9e7922e..0ef5ca2 100644 --- a/context/docker/rootfs/scripts/docker.sh +++ b/context/docker/rootfs/scripts/docker.sh @@ -20,7 +20,7 @@ set -e # shellcheck disable=SC2006 scripts_path=$(cd `dirname "$0"`; pwd) image_dir="$scripts_path/../images" -DOCKER_VERSION="19.03.14-sealer" +DOCKER_VERSION="19.03.15" # shellcheck disable=SC1091 get_distribution() { @@ -119,4 +119,5 @@ systemctl daemon-reload systemctl restart docker.service check_docker_valid -load_images \ No newline at end of file +load_images +bash "${scripts_path}"/init-kube.sh \ No newline at end of file diff --git a/context/docker/rootfs/scripts/uninstall-docker.sh b/context/docker/rootfs/scripts/uninstall-docker.sh index 5fc6b7a..3c0b590 100644 --- a/context/docker/rootfs/scripts/uninstall-docker.sh +++ b/context/docker/rootfs/scripts/uninstall-docker.sh @@ -23,4 +23,5 @@ rm -f /usr/bin/runc rm -f /usr/bin/vpnkit rm -f /usr/bin/containerd-rootless-setuptool.sh rm -f /usr/bin/containerd-rootless.sh -rm -f /usr/bin/nerdctl \ No newline at end of file +rm -f /usr/bin/nerdctl +rm -f /usr/bin/seautil \ No newline at end of file diff --git a/context/rootfs/scripts/init-kube.sh b/context/rootfs/scripts/init-kube.sh index 00b4a56..5ded641 100644 --- a/context/rootfs/scripts/init-kube.sh +++ b/context/rootfs/scripts/init-kube.sh @@ -4,7 +4,7 @@ # shellcheck disable=SC2164 # shellcheck disable=SC2006 # shellcheck disable=SC1091 -#scripts_path=$(cd `dirname "$0"`; pwd) +scripts_path=$(cd `dirname "$0"`; pwd) #source "${scripts_path}"/utils.sh set -x @@ -38,18 +38,18 @@ disable_firewalld() { } copy_bins() { - chmod -R 755 ../bin/* - chmod 644 ../bin - cp ../bin/* /usr/bin - cp ../scripts/kubelet-pre-start.sh /usr/bin + chmod -R 755 "${scripts_path}"/../bin/* + chmod 644 "${scripts_path}"/../bin + cp "${scripts_path}"/../bin/* /usr/bin + cp "${scripts_path}"/../scripts/kubelet-pre-start.sh /usr/bin chmod +x /usr/bin/kubelet-pre-start.sh } copy_kubelet_service(){ mkdir -p /etc/systemd/system - cp ../etc/kubelet.service /etc/systemd/system/ + cp "${scripts_path}"/../etc/kubelet.service /etc/systemd/system/ [ -d /etc/systemd/system/kubelet.service.d ] || mkdir /etc/systemd/system/kubelet.service.d - cp ../etc/10-kubeadm.conf /etc/systemd/system/kubelet.service.d/ + cp "${scripts_path}"/../etc/10-kubeadm.conf /etc/systemd/system/kubelet.service.d/ } disable_firewalld