mirror of
https://github.com/kubesphere/kubekey.git
synced 2025-12-26 01:22:51 +00:00
fix some action mistakes
Signed-off-by: pixiake <guofeng@yunify.com>
This commit is contained in:
parent
5e899b6070
commit
1122bd528e
|
|
@ -1,33 +0,0 @@
|
|||
FROM ubuntu:16.04 as ubuntu1604
|
||||
ARG TARGETARCH
|
||||
ARG OS_RELEASE=xenial
|
||||
ARG DIR=ubuntu-16.04-${TARGETARCH}-debs
|
||||
ARG PKGS=.common[],.debs[],.ubuntu[],.ubuntu1604[]
|
||||
ARG BUILD_TOOLS="apt-transport-https software-properties-common ca-certificates curl wget gnupg dpkg-dev genisoimage"
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# dump system package list
|
||||
RUN dpkg --get-selections | grep -v deinstall | cut -f1 | cut -d ':' -f1 > packages.list
|
||||
RUN apt update -qq \
|
||||
&& apt install -y --no-install-recommends $BUILD_TOOLS \
|
||||
&& add-apt-repository ppa:gluster/glusterfs-7 -y \
|
||||
&& curl -fsSL "https://download.docker.com/linux/ubuntu/gpg" | apt-key add -qq - \
|
||||
&& echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu ${OS_RELEASE} stable" > /etc/apt/sources.list.d/docker.list\
|
||||
&& apt update -qq
|
||||
|
||||
WORKDIR /package
|
||||
COPY packages.yaml .
|
||||
|
||||
COPY --from=mikefarah/yq:4.11.1 /usr/bin/yq /usr/bin/yq
|
||||
RUN yq eval "${PKGS}" packages.yaml >> packages.list \
|
||||
&& sort -u packages.list | xargs apt-get install --yes --reinstall --print-uris | awk -F "'" '{print $2}' | grep -v '^$' | sort -u > packages.urls
|
||||
|
||||
RUN mkdir -p ${DIR} \
|
||||
&& wget -q -x -P ${DIR} -i packages.urls \
|
||||
&& cd ${DIR} \
|
||||
&& dpkg-scanpackages ./ /dev/null | gzip -9c > ./Packages.gz
|
||||
|
||||
RUN genisoimage -r -o ${DIR}.iso ${DIR}
|
||||
|
||||
FROM scratch
|
||||
COPY --from=ubuntu1604 /package/*.iso /
|
||||
|
|
@ -16,19 +16,6 @@ RUN apt update -qq \
|
|||
&& echo "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu ${OS_RELEASE} stable" > /etc/apt/sources.list.d/docker.list\
|
||||
&& apt update -qq
|
||||
|
||||
# install NVIDIA CUDA
|
||||
RUN if [ "${TARGETARCH}" = "amd64" ]; then \
|
||||
ARCH=x86_64; \
|
||||
else \
|
||||
ARCH=${TARGETARCH}; \
|
||||
fi \
|
||||
&& wget https://developer.download.nvidia.com/compute/cuda/repos/${DISTRO}/${ARCH}/cuda-archive-keyring.gpg \
|
||||
&& mv cuda-archive-keyring.gpg /usr/share/keyrings/cuda-archive-keyring.gpg \
|
||||
&& echo "deb [signed-by=/usr/share/keyrings/cuda-archive-keyring.gpg] https://developer.download.nvidia.com/compute/cuda/repos/${DISTRO}/${ARCH}/ /" | tee /etc/apt/sources.list.d/cuda-${DISTRO}-${ARCH}.list \
|
||||
&& wget https://developer.download.nvidia.com/compute/cuda/repos/${DISTRO}/${ARCH}/cuda-${DISTRO}.pin \
|
||||
&& mv cuda-${DISTRO}.pin /etc/apt/preferences.d/cuda-repository-pin-600 \
|
||||
&& apt-get update
|
||||
|
||||
WORKDIR /package
|
||||
COPY packages.yaml .
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,6 @@ debs:
|
|||
- openssh-server
|
||||
- software-properties-common
|
||||
- sudo
|
||||
- cuda-toolkit-12-4
|
||||
- nvidia-driver-550-open
|
||||
- cuda-drivers-550
|
||||
|
||||
centos:
|
||||
- containerd.io
|
||||
|
|
@ -65,10 +62,6 @@ debian11:
|
|||
ubuntu:
|
||||
- containerd.io
|
||||
|
||||
ubuntu1604:
|
||||
- docker-ce=5:20.10.8~3-0~ubuntu-xenial
|
||||
- docker-ce-cli=5:20.10.8~3-0~ubuntu-xenial
|
||||
|
||||
ubuntu1804:
|
||||
- docker-ce=5:20.10.8~3-0~ubuntu-bionic
|
||||
- docker-ce-cli=5:20.10.8~3-0~ubuntu-bionic
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ if [ $KUBERNETES_VERSION ]; then
|
|||
|
||||
qsctl cp binaries/kube/$KUBERNETES_VERSION/$arch/$binary \
|
||||
qs://kubernetes-release/release/$KUBERNETES_VERSION/bin/linux/$arch/$binary \
|
||||
-c qsctl-config.yaml -f
|
||||
-c qsctl-config.yaml
|
||||
done
|
||||
done
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue