buildx dockerfile.dind

Author: KeyOfSpectator

Makefile

@@ -149,9 +149,12 @@ output/windows_amd64/test/bin/%.exe: $(PKG_SOURCES)
 		-tags "$(WINDOWS_BUILD_TAGS)" \
 		./test/e2e/$(subst -,,$*)
 
+# =x86_64-linux-gnu-gcc need yum install gcc-x86_64-linux-gnu.x86_64
+
 output/linux_amd64/bin/%: $(PKG_SOURCES)
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
-	  CC=x86_64-linux-gnu-gcc go build \
+#	  CC=x86_64-linux-gnu-gcc go build \
+	  CC=x86_64-redhat-linux-gcc go build \
 		-mod vendor \
 		-o $@ \
 		-ldflags '-X $(PKG)/pkg/version.version=$(VERSION)' \
@@ -161,7 +164,8 @@ output/linux_amd64/bin/%: $(PKG_SOURCES)
 
 output/linux_amd64/test/bin/%: $(PKG_SOURCES)
 	GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) GO111MODULE=on \
-	  CC=x86_64-linux-gnu-gcc go build \
+#	  CC=x86_64-linux-gnu-gcc go build \
+	  CC=x86_64-redhat-linux-gcc go build \
 		-mod vendor \
 		-o $@ \
 		-tags "$(LINUX_BUILD_TAGS)" \

builder/Dockerfile.dind

@@ -1,8 +1,8 @@
 ARG GO_VERSION=1.17
-FROM --platform=$BUILDPLATFORM golang:${GO_VERSION} as gobase
+FROM --platform=$TARGETPLATFORM golang:${GO_VERSION} as gobase
 ENV GOBIN /usr/local/go/bin
 
-FROM --platform=$BUILDPLATFORM centos:centos8 AS build-env
+FROM --platform=$TARGETPLATFORM centos:centos8 AS builder
 ARG TARGETPLATFORM
 ARG BUILDPLATFORM
 ARG BUILDARCH
@@ -47,11 +47,12 @@ RUN yum -y update; yum clean all; \
     yum -y install systemd; yum clean all; \
     yum -y install libsystemd-dev; yum clean all;\
     yum -y install systemd-devel; yum clean all;\
+    yum -y install gcc-x86_64-linux-gnu.x86_64; yum clean all;\
+    yum -y install docker-ce-19.03.15; yum clean all;\
     yum -y install make automake gcc gcc-c++ kernel-devel; yum clean all;
 
 
 
-
 #######################################################
 
 ENV GO111MODULE=on
@@ -60,16 +61,37 @@ ENV GOPROXY=https://goproxy.cn,direct
 ADD . /src/github.com/AliyunContainerService/node-problem-detector
 ENV GOPATH /:/src/github.com/AliyunContainerService/node-problem-detector/vendor
 WORKDIR /src/github.com/AliyunContainerService/node-problem-detector
-RUN pwd
-RUN ls
 
 RUN  # VERSION="{{.VERSION}}"
 RUN  # IMAGES="{{.VERSION}}"
 RUN  # REGIONS="{{.REGIONS}}"
 RUN  # LOG_LEVEL="{{.LOG_LEVEL}}"
 # RUN  ls /src/github.com/AliyunContainerService/node-problem-detector/
-# RUN  cd /workspace/source/src/github.com/AliyunContainerService/node-problem-detector/
-RUN  make ENABLE_JOURNALD=1
+# RUN  cd /src/github.com/AliyunContainerService/node-problem-detector/
+
+RUN make build-binaries LINUX_PLATFORMS=linux_$TARGETARCH
+RUN make build-tar LINUX_PLATFORMS=linux_$TARGETARCH
+
+RUN ls -lR /src/github.com/AliyunContainerService/node-problem-detector/config
+
+RUN ls -l /src/github.com/AliyunContainerService/node-problem-detector/
+
+#######################################################
+
+
+FROM --platform=$TARGETPLATFORM centos:centos8
+MAINTAINER KeyOfSpectator <[email protected]>
+
+RUN systemctl --version
+
+# RUN clean-install util-linux libsystemd0 systemd bash lsof curl
+
+# Avoid symlink of /etc/localtime.
+RUN test -h /etc/localtime && rm -f /etc/localtime && cp /usr/share/zoneinfo/UTC /etc/localtime || true
 
+COPY --from=builder /src/github.com/AliyunContainerService/node-problem-detector/bin/node-problem-detector /node-problem-detector
+COPY --from=builder /src/github.com/AliyunContainerService/node-problem-detector/bin/health-checker ${LOGCOUNTER} /home/kubernetes/bin/
 
-#######################################################
+COPY --from=builder /src/github.com/AliyunContainerService/node-problem-detector/config /config
+RUN chmod +x /config/plugin/*.sh
+CMD "/node-problem-detector", "--config.system-log-monitor=/config/kernel-monitor.json"