diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-07 10:24:35 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-07 10:50:03 +0800 |
| commit | 9055f442c2fd4e7354032f30478c710dc79bb7cf (patch) | |
| tree | 16d9ee18e769cd67d4c5d27bb5661d258871dc8f /build | |
| parent | Merge pull request #5097 from luomengY/generate_crd_charts (diff) | |
| download | kubeedge-9055f442c2fd4e7354032f30478c710dc79bb7cf.tar.gz | |
bump go version to 1.20
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/admission/Dockerfile | 4 | ||||
| -rw-r--r-- | build/cloud/Dockerfile | 4 | ||||
| -rw-r--r-- | build/conformance/Dockerfile | 4 | ||||
| -rw-r--r-- | build/conformance/nodeconformance.Dockerfile | 4 | ||||
| -rw-r--r-- | build/controllermanager/Dockerfile | 4 | ||||
| -rw-r--r-- | build/csidriver/Dockerfile | 4 | ||||
| -rw-r--r-- | build/docker/installation-package/installation-package.dockerfile | 2 | ||||
| -rw-r--r-- | build/edge/Dockerfile | 2 | ||||
| -rw-r--r-- | build/edgemark/Dockerfile | 4 | ||||
| -rw-r--r-- | build/edgesite/agent-build.Dockerfile | 2 | ||||
| -rw-r--r-- | build/edgesite/server-build.Dockerfile | 2 | ||||
| -rw-r--r-- | build/iptablesmanager/Dockerfile | 4 |
12 files changed, 20 insertions, 20 deletions
diff --git a/build/admission/Dockerfile b/build/admission/Dockerfile index 13dece4f0..49ac932b4 100644 --- a/build/admission/Dockerfile +++ b/build/admission/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/admission -ldfla github.com/kubeedge/kubeedge/cloud/cmd/admission -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /usr/local/bin/admission /usr/local/bin/admission diff --git a/build/cloud/Dockerfile b/build/cloud/Dockerfile index c7e5a9e7b..98a894627 100644 --- a/build/cloud/Dockerfile +++ b/build/cloud/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/cloudcore -ldfla github.com/kubeedge/kubeedge/cloud/cmd/cloudcore -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /usr/local/bin/cloudcore /usr/local/bin/cloudcore diff --git a/build/conformance/Dockerfile b/build/conformance/Dockerfile index f9b2df8cd..6a1bd3030 100644 --- a/build/conformance/Dockerfile +++ b/build/conformance/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and
# limitations under the License.
-FROM golang:1.19.12-alpine3.17 AS builder
+FROM golang:1.20.10-alpine3.18 AS builder
ARG GO_LDFLAGS
@@ -30,7 +30,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off ginkgo build -ldflags "-w -s -extldflags -stat RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/e2e-runner -ldflags "$GO_LDFLAGS -w -s" \
/go/src/github.com/kubeedge/kubeedge/build/conformance/e2e-runner
-FROM alpine:3.17
+FROM alpine:3.18
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
diff --git a/build/conformance/nodeconformance.Dockerfile b/build/conformance/nodeconformance.Dockerfile index f9b8cab24..82fbab51e 100644 --- a/build/conformance/nodeconformance.Dockerfile +++ b/build/conformance/nodeconformance.Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -30,7 +30,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off ginkgo build -ldflags "-w -s -extldflags -stat RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/node-e2e-runner -ldflags "$GO_LDFLAGS -w -s" \ /go/src/github.com/kubeedge/kubeedge/build/conformance/node-e2e-runner -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo diff --git a/build/controllermanager/Dockerfile b/build/controllermanager/Dockerfile index a8663c745..ee6df693c 100644 --- a/build/controllermanager/Dockerfile +++ b/build/controllermanager/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/controllermanage github.com/kubeedge/kubeedge/cloud/cmd/controllermanager -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /usr/local/bin/controllermanager /usr/local/bin/controllermanager diff --git a/build/csidriver/Dockerfile b/build/csidriver/Dockerfile index 1601c97c1..5a44d04a7 100644 --- a/build/csidriver/Dockerfile +++ b/build/csidriver/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -7,7 +7,7 @@ COPY . /go/src/github.com/kubeedge/kubeedge RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/csidriver -ldflags="${GO_LDFLAGS} -w -s" \ github.com/kubeedge/kubeedge/cloud/cmd/csidriver -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /usr/local/bin/csidriver /usr/local/bin/csidriver diff --git a/build/docker/installation-package/installation-package.dockerfile b/build/docker/installation-package/installation-package.dockerfile index 4848b7228..ec51941b9 100644 --- a/build/docker/installation-package/installation-package.dockerfile +++ b/build/docker/installation-package/installation-package.dockerfile @@ -1,4 +1,4 @@ -FROM kubeedge/build-tools:1.19.12-ke2 as builder +FROM kubeedge/build-tools:1.20.10-ke1 as builder WORKDIR /work ADD . . RUN mkdir -p bin && \ diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile index 83b6916b7..57992d317 100644 --- a/build/edge/Dockerfile +++ b/build/edge/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=golang:1.19.12-alpine3.17 +ARG BUILD_FROM=golang:1.20.10-alpine3.18 ARG RUN_FROM=docker:dind FROM ${BUILD_FROM} AS builder diff --git a/build/edgemark/Dockerfile b/build/edgemark/Dockerfile index d3b1b6ece..4275dc493 100644 --- a/build/edgemark/Dockerfile +++ b/build/edgemark/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_FROM=golang:1.19.12-alpine3.17
+ARG BUILD_FROM=golang:1.20.10-alpine3.18
FROM ${BUILD_FROM} AS builder
@@ -12,7 +12,7 @@ apk --no-cache add build-base linux-headers sqlite-dev binutils-gold && \ CGO_ENABLED=1 GO111MODULE=off go build -v -o /usr/local/bin/edgemark -ldflags="${GO_LDFLAGS} -w -s -extldflags -static" \
github.com/kubeedge/kubeedge/edge/cmd/edgemark
-FROM alpine:3.17
+FROM alpine:3.18
COPY --from=builder /usr/local/bin/edgemark /usr/local/bin/edgemark
diff --git a/build/edgesite/agent-build.Dockerfile b/build/edgesite/agent-build.Dockerfile index 682aec0e9..3532f5b20 100644 --- a/build/edgesite/agent-build.Dockerfile +++ b/build/edgesite/agent-build.Dockerfile @@ -1,5 +1,5 @@ # Build the proxy-agent binary -FROM golang:1.19.12-alpine3.17 as builder +FROM golang:1.20.10-alpine3.18 as builder WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy COPY . /go/src/github.com/kubeedge/kubeedge diff --git a/build/edgesite/server-build.Dockerfile b/build/edgesite/server-build.Dockerfile index c4d807817..37338d2ae 100644 --- a/build/edgesite/server-build.Dockerfile +++ b/build/edgesite/server-build.Dockerfile @@ -1,5 +1,5 @@ # Build the proxy-server binary -FROM golang:1.19.12-alpine3.17 as builder +FROM golang:1.20.10-alpine3.18 as builder # Copy in the go src WORKDIR /go/src/sigs.k8s.io/apiserver-network-proxy diff --git a/build/iptablesmanager/Dockerfile b/build/iptablesmanager/Dockerfile index 6e9ee3941..bd55c7910 100644 --- a/build/iptablesmanager/Dockerfile +++ b/build/iptablesmanager/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19.12-alpine3.17 AS builder +FROM golang:1.20.10-alpine3.18 AS builder ARG GO_LDFLAGS @@ -8,7 +8,7 @@ RUN CGO_ENABLED=0 GO111MODULE=off go build -v -o /usr/local/bin/iptables-manager github.com/kubeedge/kubeedge/cloud/cmd/iptablesmanager -FROM alpine:3.17 +FROM alpine:3.18 COPY --from=builder /usr/local/bin/iptables-manager /usr/local/bin/iptables-manager |
