From 1191fd21e4548d917dff7db9fdf2e684ae2386da Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Wed, 10 May 2023 16:04:13 +0800 Subject: [PATCH 1/3] deployments(ticdc): install wget and add cache --- deployments/ticdc/docker/integration-test.Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deployments/ticdc/docker/integration-test.Dockerfile b/deployments/ticdc/docker/integration-test.Dockerfile index b470ab79ff1..1d52e77f6d9 100644 --- a/deployments/ticdc/docker/integration-test.Dockerfile +++ b/deployments/ticdc/docker/integration-test.Dockerfile @@ -5,6 +5,9 @@ FROM amd64/centos:centos7 as downloader USER root WORKDIR /root/download +# Installing dependencies. +RUN yum install -y \ + wget COPY ./scripts/download-integration-test-binaries.sh . # Download all binaries into bin dir. RUN ./download-integration-test-binaries.sh master @@ -57,6 +60,6 @@ COPY . . # Clean bin dir and build TiCDC. # We always need to clean before we build, please don't adjust its order. RUN make clean -RUN make integration_test_build cdc +RUN --mount=type=cache,target=/root/.cache/go-build,target=/go/pkg/mod make integration_test_build cdc COPY --from=downloader /root/download/bin/* ./bin/ -RUN make check_third_party_binary +RUN --mount=type=cache,target=/root/.cache/go-build,target=/go/pkg/mod make check_third_party_binary From e6732332402f29000e1377f8154e609301dc3d6f Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Fri, 12 May 2023 16:42:31 +0800 Subject: [PATCH 2/3] Add procps --- deployments/ticdc/docker/integration-test.Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployments/ticdc/docker/integration-test.Dockerfile b/deployments/ticdc/docker/integration-test.Dockerfile index 1d52e77f6d9..1b510f776ea 100644 --- a/deployments/ticdc/docker/integration-test.Dockerfile +++ b/deployments/ticdc/docker/integration-test.Dockerfile @@ -38,7 +38,8 @@ RUN yum install -y \ musl-dev \ sudo \ python3 \ - psmisc + psmisc \ + procps RUN wget http://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm RUN yum install -y epel-release-latest-7.noarch.rpm RUN yum --enablerepo=epel install -y s3cmd From 84ca5133f88069a3f5bb66bda223c23584531600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E6=89=8B=E6=8E=89=E5=8C=85=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=B8=88?= Date: Fri, 12 May 2023 17:00:28 +0800 Subject: [PATCH 3/3] Update deployments/ticdc/docker/integration-test.Dockerfile --- deployments/ticdc/docker/integration-test.Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/deployments/ticdc/docker/integration-test.Dockerfile b/deployments/ticdc/docker/integration-test.Dockerfile index 1b510f776ea..4b41bc5fc27 100644 --- a/deployments/ticdc/docker/integration-test.Dockerfile +++ b/deployments/ticdc/docker/integration-test.Dockerfile @@ -58,9 +58,6 @@ ENV PATH $GOPATH/bin:$GOROOT/bin:$PATH WORKDIR /go/src/github.com/pingcap/tiflow COPY . . -# Clean bin dir and build TiCDC. -# We always need to clean before we build, please don't adjust its order. -RUN make clean RUN --mount=type=cache,target=/root/.cache/go-build,target=/go/pkg/mod make integration_test_build cdc COPY --from=downloader /root/download/bin/* ./bin/ RUN --mount=type=cache,target=/root/.cache/go-build,target=/go/pkg/mod make check_third_party_binary