Skip to content

Commit ed46b45

Browse files
committed
added improvements based on feedback
1 parent 8adc168 commit ed46b45

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

deploy/iso/minikube-iso/package/buildkit-bin/buildkit.service

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ After=buildkit.socket
55
Documentation=https://github.com/moby/buildkit
66

77
[Service]
8-
ExecStart=/usr/local/bin/buildkitd --addr fd:// --oci-worker=false --containerd-worker=true --containerd-worker-namespace=k8s.io
8+
ExecStart=/usr/sbin/buildkitd --addr fd:// --oci-worker=false --containerd-worker=true --containerd-worker-namespace=k8s.io
99

1010
[Install]
1111
WantedBy=multi-user.target

deploy/kicbase/Dockerfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ RUN sh -c "echo 'deb https://download.docker.com/linux/ubuntu focal stable' > /e
124124
# install buildkit
125125
RUN export ARCH=$(dpkg --print-architecture | sed 's/ppc64el/ppc64le/' | sed 's/armhf/arm-v7/') \
126126
&& echo "Installing buildkit ..." \
127+
&& addgroup --system buildkit
127128
&& export BUILDKIT_BASE_URL="https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}" \
128129
&& curl -sSL --retry 5 --output /tmp/buildkit.tgz "${BUILDKIT_BASE_URL}/buildkit-${BUILDKIT_VERSION}.linux-${ARCH}.tar.gz" \
129130
&& tar -C /usr/local -xzvf /tmp/buildkit.tgz \
@@ -191,7 +192,8 @@ EXPOSE 22
191192
# create docker user for minikube ssh. to match VM using "docker" as username
192193
RUN adduser --ingroup docker --disabled-password --gecos '' docker
193194
RUN adduser docker sudo
194-
RUN adduser docker podman buildkit
195+
RUN adduser docker podman
196+
RUN adduser docker buildkit
195197
RUN echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
196198
USER docker
197199
RUN mkdir /home/docker/.ssh

0 commit comments

Comments
 (0)