diff --git a/alertmanager-github-receiver/Dockerfile b/alertmanager-github-receiver/Dockerfile index a6fbc46..654585d 100644 --- a/alertmanager-github-receiver/Dockerfile +++ b/alertmanager-github-receiver/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM} golang:1.20.0 as builder +FROM --platform=${TARGETPLATFORM} golang:1.26 as builder ENV GOPATH /go/ ENV PATH $GOPATH/bin:$PATH diff --git a/node-exporter/PLATFORMS b/node-exporter/PLATFORMS new file mode 100644 index 0000000..329d500 --- /dev/null +++ b/node-exporter/PLATFORMS @@ -0,0 +1,3 @@ +linux/arm64 +linux/amd64 +linux/arm/v7 diff --git a/node-exporter/README.md b/node-exporter/README.md index 9572e61..b2a5d84 100644 --- a/node-exporter/README.md +++ b/node-exporter/README.md @@ -1,6 +1,6 @@ # node-exporter -This is a manifest/wrapper directory for Prometheus node-exporter. The Dockerfile references the upstream image for the pinned version while `image.arm` and `image.arm64` allow the legacy root build script to compose architecture-specific upstream images into one tag. +This is a manifest/wrapper directory for Prometheus node-exporter. The Dockerfile references the upstream image for the pinned version while `PLATFORMS` lists the architectures that the build workflow builds with buildx. It exists to give my mixed-architecture nodes a consistent `davidcollom/node-exporter:` reference. Runtime flags, mounts, and security requirements are unchanged from upstream. diff --git a/node-exporter/VERSION b/node-exporter/VERSION index 253bdcf..ff55d58 100644 --- a/node-exporter/VERSION +++ b/node-exporter/VERSION @@ -1 +1 @@ -v0.15.2 \ No newline at end of file +v1.12.1 \ No newline at end of file diff --git a/node-exporter/image.arm b/node-exporter/image.arm deleted file mode 100644 index 2187e45..0000000 --- a/node-exporter/image.arm +++ /dev/null @@ -1 +0,0 @@ -carlosedp/node_exporter:v0.15.2-arm \ No newline at end of file diff --git a/node-exporter/image.arm64 b/node-exporter/image.arm64 deleted file mode 100644 index bbbc195..0000000 --- a/node-exporter/image.arm64 +++ /dev/null @@ -1 +0,0 @@ -carlosedp/node_exporter:v0.15.2-arm64 \ No newline at end of file diff --git a/node-problem-detector/Dockerfile b/node-problem-detector/Dockerfile index efde0db..5524334 100644 --- a/node-problem-detector/Dockerfile +++ b/node-problem-detector/Dockerfile @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bullseye-v1.4.3 +ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bookworm-v1.0.4 FROM --platform=${TARGETPLATFORM} golang:1.21 as builder LABEL maintainer="Andy Xie " diff --git a/vmhub5_exporter/Dockerfile b/vmhub5_exporter/Dockerfile index cc17609..b4cf345 100644 --- a/vmhub5_exporter/Dockerfile +++ b/vmhub5_exporter/Dockerfile @@ -1,5 +1,5 @@ # Start with the official Golang image for building the binary -FROM --platform=${TARGETPLATFORM} golang:1.23 as builder +FROM --platform=${TARGETPLATFORM} golang:1.26 as builder # Set the working directory inside the container WORKDIR /app