From 5b9b272116b503b89e6145c1fe496f0e0416ff3a Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Mon, 13 May 2024 22:17:31 +0900 Subject: [PATCH] test Signed-off-by: Kohei Tokunaga --- Dockerfile | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index a855f8005..65de07117 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,8 +17,8 @@ ARG RUNC_VERSION=v1.1.12 ARG CNI_PLUGINS_VERSION=v1.4.1 ARG NERDCTL_VERSION=1.7.6 -ARG PODMAN_VERSION=v5.0.2 -ARG CRIO_VERSION=v1.30.0 +ARG PODMAN_VERSION=main +ARG CRIO_VERSION=main ARG CONMON_VERSION=v2.1.11 ARG COMMON_VERSION=v0.58.2 ARG CRIO_TEST_PAUSE_IMAGE_NAME=registry.k8s.io/pause:3.6 @@ -113,20 +113,25 @@ RUN cd $GOPATH/src/github.com/containerd/stargz-snapshotter && \ FROM golang-base AS podman-dev ARG PODMAN_VERSION RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \ - git clone https://github.com/containers/podman $GOPATH/src/github.com/containers/podman && \ - cd $GOPATH/src/github.com/containers/podman && \ - git checkout ${PODMAN_VERSION} && \ - make && make install PREFIX=/out/ + git clone https://github.com/containers/podman $GOPATH/src/github.com/containers/podman +WORKDIR $GOPATH/src/github.com/containers/podman +RUN git checkout ${PODMAN_VERSION} +RUN echo 'replace github.com/containers/image/v5 => github.com/ktock/image/v5 a1e2fff08e19601c260807d5f08c16ace8d18142' >> go.mod +RUN echo 'replace github.com/containers/storage => github.com/containers/storage 7c30bb9b46a1' >> go.mod +RUN make vendor && make && make install PREFIX=/out/ # Build CRI-O # FROM golang-base AS cri-o-dev FROM golang:1.22-bullseye AS cri-o-dev ARG CRIO_VERSION RUN apt-get update -y && apt-get install -y libseccomp-dev libgpgme-dev && \ - git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o && \ - cd $GOPATH/src/github.com/cri-o/cri-o && \ - git checkout ${CRIO_VERSION} && \ - make && make install PREFIX=/out/ && \ + git clone https://github.com/cri-o/cri-o $GOPATH/src/github.com/cri-o/cri-o + +WORKDIR $GOPATH/src/github.com/cri-o/cri-o +RUN git checkout ${CRIO_VERSION} +RUN echo 'replace github.com/containers/image/v5 => github.com/ktock/image/v5 a1e2fff08e19601c260807d5f08c16ace8d18142' >> go.mod +RUN echo 'replace github.com/containers/storage => github.com/containers/storage 7c30bb9b46a1' >> go.mod +RUN make vendor && make && make install PREFIX=/out/ && \ curl -sSL --output /out/crio.service https://raw.githubusercontent.com/cri-o/cri-o/${CRIO_VERSION}/contrib/systemd/crio.service # Build conmon