summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorShelley-BaoYue <baoyue2@huawei.com>2023-08-14 19:49:06 +0800
committerShelley-BaoYue <baoyue2@huawei.com>2023-08-21 21:13:46 +0800
commit74533efd36725c7e6d2f6948e0ab87c4ad8bac67 (patch)
tree4514db23c51106eff0f68b05fb496724920214e9 /build
parentMerge pull request #4947 from Shelley-BaoYue/bump-go1.19-buildtool (diff)
downloadkubeedge-74533efd36725c7e6d2f6948e0ab87c4ad8bac67.tar.gz
update go version to 1.19
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'build')
-rw-r--r--build/admission/Dockerfile4
-rw-r--r--build/cloud/Dockerfile4
-rw-r--r--build/conformance/Dockerfile4
-rw-r--r--build/conformance/nodeconformance.Dockerfile4
-rw-r--r--build/controllermanager/Dockerfile4
-rw-r--r--build/csidriver/Dockerfile4
-rw-r--r--build/docker/build-tools/build-tools.dockerfile4
-rwxr-xr-xbuild/docker/build-tools/make-build-tools.sh2
-rw-r--r--build/docker/installation-package/installation-package.dockerfile2
-rw-r--r--build/edge/Dockerfile2
-rw-r--r--build/edgemark/Dockerfile4
-rw-r--r--build/edgesite/agent-build.Dockerfile2
-rw-r--r--build/edgesite/server-build.Dockerfile2
-rw-r--r--build/iptablesmanager/Dockerfile4
14 files changed, 23 insertions, 23 deletions
diff --git a/build/admission/Dockerfile b/build/admission/Dockerfile
index d3a20ed3a..13dece4f0 100644
--- a/build/admission/Dockerfile
+++ b/build/admission/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.16
+FROM alpine:3.17
COPY --from=builder /usr/local/bin/admission /usr/local/bin/admission
diff --git a/build/cloud/Dockerfile b/build/cloud/Dockerfile
index fd868c37e..c7e5a9e7b 100644
--- a/build/cloud/Dockerfile
+++ b/build/cloud/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.16
+FROM alpine:3.17
COPY --from=builder /usr/local/bin/cloudcore /usr/local/bin/cloudcore
diff --git a/build/conformance/Dockerfile b/build/conformance/Dockerfile
index b578d25bd..d09a7c911 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.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.13
+FROM alpine:3.17
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
diff --git a/build/conformance/nodeconformance.Dockerfile b/build/conformance/nodeconformance.Dockerfile
index b7139d3c1..e0caf0012 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.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.13
+FROM alpine:3.17
COPY --from=builder /go/bin/ginkgo /usr/local/bin/ginkgo
diff --git a/build/controllermanager/Dockerfile b/build/controllermanager/Dockerfile
index 4bec38d9c..a8663c745 100644
--- a/build/controllermanager/Dockerfile
+++ b/build/controllermanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.16
+FROM alpine:3.17
COPY --from=builder /usr/local/bin/controllermanager /usr/local/bin/controllermanager
diff --git a/build/csidriver/Dockerfile b/build/csidriver/Dockerfile
index 3e09312cc..1601c97c1 100644
--- a/build/csidriver/Dockerfile
+++ b/build/csidriver/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.16
+FROM alpine:3.17
COPY --from=builder /usr/local/bin/csidriver /usr/local/bin/csidriver
diff --git a/build/docker/build-tools/build-tools.dockerfile b/build/docker/build-tools/build-tools.dockerfile
index 518671853..10e185479 100644
--- a/build/docker/build-tools/build-tools.dockerfile
+++ b/build/docker/build-tools/build-tools.dockerfile
@@ -2,10 +2,10 @@
FROM ubuntu:22.04
ARG ARCH=amd64
RUN apt-get update && apt-get install -y wget \
- vim git make gcc upx-ucl
+ vim git make gcc upx-ucl
RUN if [ "${ARCH}" = "amd64" ]; then apt-get install -y gcc-aarch64-linux-gnu libc6-dev-arm64-cross gcc-arm-linux-gnueabihf ; fi
-
+
RUN apt-get autoremove -y &&\
apt-get clean &&\
rm -rf /var/lib/apt/lists/*
diff --git a/build/docker/build-tools/make-build-tools.sh b/build/docker/build-tools/make-build-tools.sh
index 5e3fe4246..0a6968f6e 100755
--- a/build/docker/build-tools/make-build-tools.sh
+++ b/build/docker/build-tools/make-build-tools.sh
@@ -15,7 +15,7 @@ for arch in "${ARCHS[@]}" ; do
REPOSITORY_ARCH="$REPOSITORY"-"$arch"
if [ "$arch" = "amd64" ]; then
REPOSITORY_ARCH="$REPOSITORY"
- fi
+ fi
docker buildx build --build-arg ARCH="$arch" --platform "$arch" -t "$REPOSITORY_ARCH":"$IMAGE_TAG" -f "$WORK_DIR/build-tools.dockerfile" -o type=docker .
done
diff --git a/build/docker/installation-package/installation-package.dockerfile b/build/docker/installation-package/installation-package.dockerfile
index 9057b0444..9f264350e 100644
--- a/build/docker/installation-package/installation-package.dockerfile
+++ b/build/docker/installation-package/installation-package.dockerfile
@@ -5,7 +5,7 @@ RUN mkdir -p bin && \
make WHAT=edgecore BUILD_WITH_CONTAINER=false && cp _output/local/bin/edgecore bin/edgecore && \
make WHAT=keadm BUILD_WITH_CONTAINER=false && cp _output/local/bin/keadm bin/keadm
-FROM ubuntu:18.04
+FROM ubuntu:22.04
COPY --from=builder /work/_output/local/bin/edgecore /usr/local/bin/edgecore
COPY --from=builder /work/_output/local/bin/keadm /usr/local/bin/keadm
diff --git a/build/edge/Dockerfile b/build/edge/Dockerfile
index d1a0cc057..83b6916b7 100644
--- a/build/edge/Dockerfile
+++ b/build/edge/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=golang:1.17.13-alpine3.16
+ARG BUILD_FROM=golang:1.19.12-alpine3.17
ARG RUN_FROM=docker:dind
FROM ${BUILD_FROM} AS builder
diff --git a/build/edgemark/Dockerfile b/build/edgemark/Dockerfile
index e9d57497b..d3b1b6ece 100644
--- a/build/edgemark/Dockerfile
+++ b/build/edgemark/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=golang:1.17.13-alpine3.16
+ARG BUILD_FROM=golang:1.19.12-alpine3.17
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.16
+FROM alpine:3.17
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 f259b8e28..682aec0e9 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.17.13-alpine3.16 as builder
+FROM golang:1.19.12-alpine3.17 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 70c209d81..c4d807817 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.17.13-alpine3.16 as builder
+FROM golang:1.19.12-alpine3.17 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 1169139bf..6e9ee3941 100644
--- a/build/iptablesmanager/Dockerfile
+++ b/build/iptablesmanager/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17.13-alpine3.16 AS builder
+FROM golang:1.19.12-alpine3.17 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.16
+FROM alpine:3.17
COPY --from=builder /usr/local/bin/iptables-manager /usr/local/bin/iptables-manager