From d42c34786f247f0913b1cd03c2f58217e24dd144 Mon Sep 17 00:00:00 2001 From: Vadim Bauer Date: Thu, 26 Sep 2024 09:11:11 +0200 Subject: [PATCH] Make it possible to build the spectral image also on ARM (#20506) * This makes changes makes it possible to build the spectral image also on ARM architecture. * no message Signed-off-by: Vadim Bauer * fix issue Signed-off-by: Vadim Bauer --------- Signed-off-by: Vadim Bauer --- Makefile | 2 +- tools/spectral/Dockerfile | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 45efb936f2c..a098f8d58f3 100644 --- a/Makefile +++ b/Makefile @@ -282,7 +282,7 @@ endef # lint swagger doc SPECTRAL_IMAGENAME=$(IMAGENAMESPACE)/spectral -SPECTRAL_VERSION=v6.1.0 +SPECTRAL_VERSION=v6.11.1 SPECTRAL_IMAGE_BUILD_CMD=${DOCKERBUILD} -f ${TOOLSPATH}/spectral/Dockerfile --build-arg GOLANG=${GOBUILDIMAGE} --build-arg SPECTRAL_VERSION=${SPECTRAL_VERSION} -t ${SPECTRAL_IMAGENAME}:$(SPECTRAL_VERSION) . SPECTRAL=$(RUNCONTAINER) $(SPECTRAL_IMAGENAME):$(SPECTRAL_VERSION) diff --git a/tools/spectral/Dockerfile b/tools/spectral/Dockerfile index d9fc51793e1..0a93965a317 100644 --- a/tools/spectral/Dockerfile +++ b/tools/spectral/Dockerfile @@ -2,7 +2,16 @@ ARG GOLANG FROM ${GOLANG} ARG SPECTRAL_VERSION -RUN curl -fsSL -o /usr/bin/spectral https://github.com/stoplightio/spectral/releases/download/$SPECTRAL_VERSION/spectral-linux && chmod +x /usr/bin/spectral +RUN case "$(dpkg --print-architecture)" in \ + amd64) ARCH="x64" ;; \ + arm64) ARCH="arm64" ;; \ + *) echo "Unsupported architecture" && exit 1 ;; \ + esac && \ + echo "Architecture: $ARCH" && \ + echo "Spectral version: $SPECTRAL_VERSION" && \ + URL="https://github.com/stoplightio/spectral/releases/download/$SPECTRAL_VERSION/spectral-linux-$ARCH" && \ + echo "URL: $URL" && \ + curl -fsSL -o /usr/bin/spectral $URL && chmod +x /usr/bin/spectral ENTRYPOINT ["/usr/bin/spectral"] CMD ["--version"]