From 716a0bbd42e18958b81d5ac9701aab3477e30058 Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Tue, 23 Jan 2024 14:14:34 +0900 Subject: [PATCH 1/2] Stop using ENV ARCH --- dockers/agent/core/ngt/Dockerfile | 9 ++++----- dockers/agent/sidecar/Dockerfile | 9 ++++----- dockers/ci/base/Dockerfile | 9 ++++----- dockers/dev/Dockerfile | 10 ++++------ dockers/discoverer/k8s/Dockerfile | 9 ++++----- dockers/gateway/filter/Dockerfile | 9 ++++----- dockers/gateway/lb/Dockerfile | 9 ++++----- dockers/gateway/mirror/Dockerfile | 9 ++++----- dockers/index/job/correction/Dockerfile | 9 ++++----- dockers/index/job/creation/Dockerfile | 9 ++++----- dockers/index/job/readreplica/rotate/Dockerfile | 9 ++++----- dockers/index/job/save/Dockerfile | 9 ++++----- dockers/manager/index/Dockerfile | 9 ++++----- dockers/tools/benchmark/job/Dockerfile | 9 ++++----- dockers/tools/benchmark/operator/Dockerfile | 9 ++++----- dockers/tools/cli/loadtest/Dockerfile | 5 ++--- 16 files changed, 62 insertions(+), 79 deletions(-) diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile index a13e92d0bd..d98150a793 100644 --- a/dockers/agent/core/ngt/Dockerfile +++ b/dockers/agent/core/ngt/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -68,8 +67,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -92,8 +91,8 @@ COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} RUN make ngt/install -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/agent/sidecar/Dockerfile b/dockers/agent/sidecar/Dockerfile index c602fbd43b..7784edf21a 100644 --- a/dockers/agent/sidecar/Dockerfile +++ b/dockers/agent/sidecar/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV GOPATH /go ENV GOROOT /opt/go @@ -61,8 +60,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -84,8 +83,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile index edf2db83d7..2bb5787508 100644 --- a/dockers/ci/base/Dockerfile +++ b/dockers/ci/base/Dockerfile @@ -25,7 +25,6 @@ LABEL maintainer="${MAINTAINER}" ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -74,12 +73,12 @@ COPY apis/proto apis/proto COPY versions versions COPY hack/go.mod.default hack/go.mod.default -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make deps ROOTDIR=$ROOTDIR GO_CLEAN_DEPS=false -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make ngt/install \ && make helm/install \ && make helm-docs/install \ diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile index 00ae3fa9da..7a33529525 100644 --- a/dockers/dev/Dockerfile +++ b/dockers/dev/Dockerfile @@ -23,8 +23,6 @@ LABEL maintainer="${MAINTAINER}" ARG TARGETARCH -ENV ARCH=${TARGETARCH} - # skipcq: DOK-DL3008 RUN apt-get update && apt-get install -y --no-install-recommends \ build-essential \ @@ -55,8 +53,8 @@ COPY versions versions COPY hack/go.mod.default hack/go.mod.default # basic deps -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make deps GO_CLEAN_DEPS=false \ && make ngt/install \ && make helm/install \ @@ -68,8 +66,8 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ && make kubectl/install # additional deps -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make k3d/install \ && make buf/install \ && make k9s/install \ diff --git a/dockers/discoverer/k8s/Dockerfile b/dockers/discoverer/k8s/Dockerfile index d6819fe551..7de2fd243a 100644 --- a/dockers/discoverer/k8s/Dockerfile +++ b/dockers/discoverer/k8s/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -61,8 +60,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -81,8 +80,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/gateway/filter/Dockerfile b/dockers/gateway/filter/Dockerfile index 23dcafa1dd..2ca5eb6301 100644 --- a/dockers/gateway/filter/Dockerfile +++ b/dockers/gateway/filter/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/gateway/lb/Dockerfile b/dockers/gateway/lb/Dockerfile index d54cd7b49d..7d67100c8c 100644 --- a/dockers/gateway/lb/Dockerfile +++ b/dockers/gateway/lb/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile index d146917731..9f837fedf1 100644 --- a/dockers/gateway/mirror/Dockerfile +++ b/dockers/gateway/mirror/Dockerfile @@ -25,7 +25,6 @@ FROM ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -56,8 +55,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ go mod download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -82,8 +81,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} COPY Makefile . COPY .git . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/index/job/correction/Dockerfile b/dockers/index/job/correction/Dockerfile index bb7c3e3d3c..b230baa3e8 100644 --- a/dockers/index/job/correction/Dockerfile +++ b/dockers/index/job/correction/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/index/job/creation/Dockerfile b/dockers/index/job/creation/Dockerfile index a0bd366138..aec6cded89 100644 --- a/dockers/index/job/creation/Dockerfile +++ b/dockers/index/job/creation/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile index 36e19db46f..1e062b91ca 100644 --- a/dockers/index/job/readreplica/rotate/Dockerfile +++ b/dockers/index/job/readreplica/rotate/Dockerfile @@ -26,7 +26,6 @@ FROM ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/index/job/save/Dockerfile b/dockers/index/job/save/Dockerfile index 6b5a6beb39..9146892bba 100644 --- a/dockers/index/job/save/Dockerfile +++ b/dockers/index/job/save/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/manager/index/Dockerfile b/dockers/manager/index/Dockerfile index 72a77f0cd7..056624f3ff 100644 --- a/dockers/manager/index/Dockerfile +++ b/dockers/manager/index/Dockerfile @@ -26,7 +26,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -80,8 +79,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile index 3d678ee7ba..0f993334e3 100644 --- a/dockers/tools/benchmark/job/Dockerfile +++ b/dockers/tools/benchmark/job/Dockerfile @@ -32,7 +32,6 @@ ARG ZLIB_VERSION ARG HDF5_VERSION ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -90,8 +89,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -110,8 +109,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile index 22e298b3f2..b9771c9120 100644 --- a/dockers/tools/benchmark/operator/Dockerfile +++ b/dockers/tools/benchmark/operator/Dockerfile @@ -27,7 +27,6 @@ FROM ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -65,8 +64,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal @@ -85,8 +84,8 @@ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/versions COPY versions . WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO} -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" diff --git a/dockers/tools/cli/loadtest/Dockerfile b/dockers/tools/cli/loadtest/Dockerfile index 22c181fc9c..eeabbc9dda 100644 --- a/dockers/tools/cli/loadtest/Dockerfile +++ b/dockers/tools/cli/loadtest/Dockerfile @@ -24,7 +24,6 @@ FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH -ENV ARCH=${TARGETARCH} ENV GO111MODULE on ENV DEBIAN_FRONTEND noninteractive ENV INITRD No @@ -60,8 +59,8 @@ COPY .git . COPY go.mod . COPY go.sum . -RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${ARCH}" \ - --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${ARCH}" \ +RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ + --mount=type=cache,target="${HOME}/.cache/go-build",id="go-build-${TARGETARCH}" \ make go/download WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/internal From 085f31e17062373073377fcc70929051b2a16b41 Mon Sep 17 00:00:00 2001 From: "yusuke.kadowaki" Date: Tue, 23 Jan 2024 14:18:55 +0900 Subject: [PATCH 2/2] Update Dockerfile platform specification --- dockers/gateway/mirror/Dockerfile | 6 +++--- dockers/index/job/readreplica/rotate/Dockerfile | 6 +++--- dockers/tools/benchmark/job/Dockerfile | 6 +++--- dockers/tools/benchmark/operator/Dockerfile | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dockers/gateway/mirror/Dockerfile b/dockers/gateway/mirror/Dockerfile index 9f837fedf1..58d41d32f1 100644 --- a/dockers/gateway/mirror/Dockerfile +++ b/dockers/gateway/mirror/Dockerfile @@ -19,9 +19,9 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS golang +FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang -FROM ubuntu:devel AS builder +FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH @@ -86,7 +86,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ make REPO=${ORG} NAME=${REPO} cmd/${PKG}/${APP_NAME} \ && mv "cmd/${PKG}/${APP_NAME}" "/usr/bin/${APP_NAME}" -FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer "${MAINTAINER}" ENV APP_NAME mirror diff --git a/dockers/index/job/readreplica/rotate/Dockerfile b/dockers/index/job/readreplica/rotate/Dockerfile index 1e062b91ca..d22f7a6e95 100644 --- a/dockers/index/job/readreplica/rotate/Dockerfile +++ b/dockers/index/job/readreplica/rotate/Dockerfile @@ -20,9 +20,9 @@ ARG DISTROLESS_IMAGE=gcr.io/distroless/static ARG DISTROLESS_IMAGE_TAG=nonroot ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS golang +FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang -FROM ubuntu:devel AS builder +FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH @@ -87,7 +87,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME readreplica-rotate diff --git a/dockers/tools/benchmark/job/Dockerfile b/dockers/tools/benchmark/job/Dockerfile index 0f993334e3..acef095c7e 100644 --- a/dockers/tools/benchmark/job/Dockerfile +++ b/dockers/tools/benchmark/job/Dockerfile @@ -23,9 +23,9 @@ ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS golang +FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang -FROM ubuntu:devel AS builder +FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG UPX_OPTIONS ARG ZLIB_VERSION @@ -117,7 +117,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME job diff --git a/dockers/tools/benchmark/operator/Dockerfile b/dockers/tools/benchmark/operator/Dockerfile index b9771c9120..e629f68ca1 100644 --- a/dockers/tools/benchmark/operator/Dockerfile +++ b/dockers/tools/benchmark/operator/Dockerfile @@ -21,9 +21,9 @@ ARG DISTROLESS_IMAGE_TAG=nonroot ARG UPX_OPTIONS=-9 ARG MAINTAINER="vdaas.org vald team " -FROM golang:${GO_VERSION} AS golang +FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS golang -FROM ubuntu:devel AS builder +FROM --platform=${BUILDPLATFORM} ubuntu:devel AS builder ARG TARGETARCH @@ -92,7 +92,7 @@ RUN --mount=type=cache,target="${GOPATH}/pkg",id="go-build-${TARGETARCH}" \ WORKDIR ${GOPATH}/src/github.com/${ORG}/${REPO}/cmd/${PKG} RUN cp sample.yaml /tmp/config.yaml -FROM ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} +FROM --platform=${BUILDPLATFORM} ${DISTROLESS_IMAGE}:${DISTROLESS_IMAGE_TAG} LABEL maintainer="${MAINTAINER}" ENV APP_NAME operator