Skip to content

Commit

Permalink
base: update runc to master (Jan 20, 2021)
Browse files Browse the repository at this point in the history
Signed-off-by: Akihiro Suda <[email protected]>
  • Loading branch information
AkihiroSuda committed Jan 21, 2021
1 parent f8e85d7 commit b97f4f5
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions images/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# runc (v1.0.0-rc93-pre)
FROM golang:1.15-alpine AS runc
RUN apk add --no-cache git build-base libseccomp-dev libseccomp-static
RUN git clone -q https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc
WORKDIR /go/src/github.com/opencontainers/runc
# Jan 20, 2021
ARG RUNC_VERSION="6e04ad73b70eef820230d565ebff06e4c3cae7eb"
RUN git checkout "${RUNC_VERSION}"
RUN make static install

# kind node base image
#
# For systemd + docker configuration used below, see the following references:
Expand Down Expand Up @@ -88,10 +98,7 @@ RUN echo "Ensuring scripts are executable ..." \
&& tar -C /usr/local -xzvf /tmp/containerd.tgz \
&& rm -rf /tmp/containerd.tgz \
&& rm -f /usr/local/bin/containerd-stress /usr/local/bin/containerd-shim-runc-v1 \
&& curl -sSL --retry 5 --output /usr/local/sbin/runc "${CONTAINERD_BASE_URL}/runc.${ARCH}" \
&& chmod 755 /usr/local/sbin/runc \
&& containerd --version \
&& runc --version \
&& systemctl enable containerd \
&& echo "Installing crictl ..." \
&& export CRICTL_URL="https://github.com/kubernetes-sigs/cri-tools/releases/download/${CRICTL_VERSION}/crictl-${CRICTL_VERSION}-linux-${ARCH}.tar.gz" \
Expand Down Expand Up @@ -119,6 +126,8 @@ RUN echo "Ensuring scripts are executable ..." \
&& echo "Disabling udev" \
&& systemctl disable udev.service

COPY --from=runc /usr/local/sbin/runc /usr/local/sbin/runc

# tell systemd that it is in docker (it will check for the container env)
# https://systemd.io/CONTAINER_INTERFACE/
ENV container docker
Expand Down

0 comments on commit b97f4f5

Please sign in to comment.