kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added improvements based on feedback

pull/12081/head
Steven Powell 2021-08-03 09:39:55 -07:00
parent dbc7ace360
commit 2c624cdeac
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service
View File

@ -5,7 +5,7 @@ After=buildkit.socket
Documentation=https://github.com/moby/buildkit Documentation=https://github.com/moby/buildkit
[Service] [Service]
ExecStart=/usr/local/bin/buildkitd --addr fd:// --oci-worker=false --containerd-worker=true --containerd-worker-namespace=k8s.io ExecStart=/usr/sbin/buildkitd --addr fd:// --oci-worker=false --containerd-worker=true --containerd-worker-namespace=k8s.io
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

4
deploy/kicbase/Dockerfile
View File

@ -142,6 +142,7 @@ COPY deploy/kicbase/containerd-fuse-overlayfs.service /etc/systemd/system/contai
# install buildkit # install buildkit
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \ RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
&& echo "Installing buildkit ..." \ && echo "Installing buildkit ..." \
&& addgroup --system buildkit
&& export BUILDKIT_BASE_URL="https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}" \ && export BUILDKIT_BASE_URL="https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}" \
&& curl -sSL --retry 5 --output /tmp/buildkit.tgz "${BUILDKIT_BASE_URL}/buildkit-${BUILDKIT_VERSION}.linux-${ARCH}.tar.gz" \ && curl -sSL --retry 5 --output /tmp/buildkit.tgz "${BUILDKIT_BASE_URL}/buildkit-${BUILDKIT_VERSION}.linux-${ARCH}.tar.gz" \
&& tar -C /usr/local -xzvf /tmp/buildkit.tgz \ && tar -C /usr/local -xzvf /tmp/buildkit.tgz \
@ -209,7 +210,8 @@ EXPOSE 22
# create docker user for minikube ssh. to match VM using "docker" as username # create docker user for minikube ssh. to match VM using "docker" as username
RUN adduser --ingroup docker --disabled-password --gecos '' docker RUN adduser --ingroup docker --disabled-password --gecos '' docker
RUN adduser docker sudo RUN adduser docker sudo
RUN adduser docker podman buildkit RUN adduser docker podman
RUN adduser docker buildkit
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
USER docker USER docker
RUN mkdir /home/docker/.ssh RUN mkdir /home/docker/.ssh