added improvements based on feedback

kubernetes · Aug 3, 2021 · 4797ad8 · 4797ad8
1 parent aa75009
commit 4797ad8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service b/deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service
@@ -5,7 +5,7 @@ After=buildkit.socket
 Documentation=https://github.com/moby/buildkit
 
 [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]
 WantedBy=multi-user.target
diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile
@@ -124,6 +124,7 @@ RUN sh -c "echo 'deb https://download.docker.com/linux/ubuntu focal stable' > /e
 # install buildkit
 RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
  && echo "Installing buildkit ..." \
+    && addgroup --system buildkit
     && 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" \
     && tar -C /usr/local -xzvf /tmp/buildkit.tgz \
@@ -191,7 +192,8 @@ EXPOSE 22
 # create docker user for minikube ssh. to match VM using "docker" as username
 RUN adduser --ingroup docker --disabled-password --gecos '' docker 
 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
 USER docker
 RUN mkdir /home/docker/.ssh