From 395894688ce741ca4eb36b303f2956dfa76b367f Mon Sep 17 00:00:00 2001 From: f41gh7 Date: Fri, 6 Sep 2024 18:12:17 +0200 Subject: [PATCH] app/*/multiarch: return back empty value for TARGETARCH follow-up after 91456ab5bbe7342b18067f3376a023239f9df57d docker buildx uses special variables, such as TARGETARCH and it shouldn't be overwritten. See this article for details https://www.docker.com/blog/faster-multi-platform-builds-dockerfile-cross-compilation-guide/ Signed-off-by: f41gh7 --- app/victoria-logs/multiarch/Dockerfile | 2 +- app/vmagent/multiarch/Dockerfile | 2 +- app/vmalert-tool/multiarch/Dockerfile | 2 +- app/vmalert/multiarch/Dockerfile | 2 +- app/vmauth/multiarch/Dockerfile | 2 +- app/vmbackup/multiarch/Dockerfile | 2 +- app/vmctl/multiarch/Dockerfile | 2 +- app/vminsert/multiarch/Dockerfile | 8 ++++---- app/vmrestore/multiarch/Dockerfile | 2 +- app/vmselect/multiarch/Dockerfile | 2 +- app/vmstorage/multiarch/Dockerfile | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/victoria-logs/multiarch/Dockerfile b/app/victoria-logs/multiarch/Dockerfile index 1ff166ea0c..f27828d81d 100644 --- a/app/victoria-logs/multiarch/Dockerfile +++ b/app/victoria-logs/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 9428 ENTRYPOINT ["/victoria-logs-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY victoria-logs-linux-${TARGETARCH}-prod ./victoria-logs-prod diff --git a/app/vmagent/multiarch/Dockerfile b/app/vmagent/multiarch/Dockerfile index 9e8f7a3fd8..f6818075e1 100644 --- a/app/vmagent/multiarch/Dockerfile +++ b/app/vmagent/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 8429 ENTRYPOINT ["/vmagent-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmagent-linux-${TARGETARCH}-prod ./vmagent-prod diff --git a/app/vmalert-tool/multiarch/Dockerfile b/app/vmalert-tool/multiarch/Dockerfile index e02dd73cf7..a0e17b2f37 100644 --- a/app/vmalert-tool/multiarch/Dockerfile +++ b/app/vmalert-tool/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 8429 ENTRYPOINT ["/vmalert-tool-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmalert-tool-linux-${TARGETARCH}-prod ./vmalert-tool-prod diff --git a/app/vmalert/multiarch/Dockerfile b/app/vmalert/multiarch/Dockerfile index a376156b3e..7d0f2f3f19 100644 --- a/app/vmalert/multiarch/Dockerfile +++ b/app/vmalert/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 8880 ENTRYPOINT ["/vmalert-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmalert-linux-${TARGETARCH}-prod ./vmalert-prod diff --git a/app/vmauth/multiarch/Dockerfile b/app/vmauth/multiarch/Dockerfile index 9dea6e320d..4b14f9a565 100644 --- a/app/vmauth/multiarch/Dockerfile +++ b/app/vmauth/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 8427 ENTRYPOINT ["/vmauth-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmauth-linux-${TARGETARCH}-prod ./vmauth-prod diff --git a/app/vmbackup/multiarch/Dockerfile b/app/vmbackup/multiarch/Dockerfile index aac0da170d..8e66b9f2f9 100644 --- a/app/vmbackup/multiarch/Dockerfile +++ b/app/vmbackup/multiarch/Dockerfile @@ -7,5 +7,5 @@ RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmbackup-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmbackup-linux-${TARGETARCH}-prod ./vmbackup-prod diff --git a/app/vmctl/multiarch/Dockerfile b/app/vmctl/multiarch/Dockerfile index 48898ee378..6dd1a4c07c 100644 --- a/app/vmctl/multiarch/Dockerfile +++ b/app/vmctl/multiarch/Dockerfile @@ -7,5 +7,5 @@ RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmctl-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmctl-linux-${TARGETARCH}-prod ./vmctl-prod diff --git a/app/vminsert/multiarch/Dockerfile b/app/vminsert/multiarch/Dockerfile index 70ad7631e9..f161b83d03 100644 --- a/app/vminsert/multiarch/Dockerfile +++ b/app/vminsert/multiarch/Dockerfile @@ -6,7 +6,7 @@ RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt -EXPOSE 8480 -ENTRYPOINT ["/vminsert-prod"] -ARG TARGETARCH=non-existing -COPY vminsert-linux-${TARGETARCH}-prod ./vminsert-prod +EXPOSE 8428 +ENTRYPOINT ["/victoria-metrics-prod"] +ARG TARGETARCH +COPY victoria-metrics-linux-${TARGETARCH}-prod ./victoria-metrics-prod diff --git a/app/vmrestore/multiarch/Dockerfile b/app/vmrestore/multiarch/Dockerfile index a95249d10b..a1bf2399a5 100644 --- a/app/vmrestore/multiarch/Dockerfile +++ b/app/vmrestore/multiarch/Dockerfile @@ -7,5 +7,5 @@ RUN apk update && apk upgrade && apk --update --no-cache add ca-certificates FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt ENTRYPOINT ["/vmrestore-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmrestore-linux-${TARGETARCH}-prod ./vmrestore-prod diff --git a/app/vmselect/multiarch/Dockerfile b/app/vmselect/multiarch/Dockerfile index dac5c2b5c6..99a406d1db 100644 --- a/app/vmselect/multiarch/Dockerfile +++ b/app/vmselect/multiarch/Dockerfile @@ -8,5 +8,5 @@ FROM $root_image COPY --from=certs /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt EXPOSE 8481 ENTRYPOINT ["/vmselect-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmselect-linux-${TARGETARCH}-prod ./vmselect-prod diff --git a/app/vmstorage/multiarch/Dockerfile b/app/vmstorage/multiarch/Dockerfile index 5922371336..21193c43e4 100644 --- a/app/vmstorage/multiarch/Dockerfile +++ b/app/vmstorage/multiarch/Dockerfile @@ -10,5 +10,5 @@ EXPOSE 8482 EXPOSE 8400 EXPOSE 8401 ENTRYPOINT ["/vmstorage-prod"] -ARG TARGETARCH=non-existing +ARG TARGETARCH COPY vmstorage-linux-${TARGETARCH}-prod ./vmstorage-prod