From d6615cb698782c670325aca9b865c4e983c621ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Thu, 25 May 2023 10:56:02 +0200 Subject: [PATCH] makefile, docker: purge deleted (satellite) inspector tool from build files the inspector tool of satellite is removed recently. We need to remove it from the build/docker files. Change-Id: Icd75474ea64fe5f9dd4ed76d8597982108f93536 --- Makefile | 7 ++----- cmd/satellite/Dockerfile | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 4942cb08f..b88eb80d5 100644 --- a/Makefile +++ b/Makefile @@ -397,9 +397,6 @@ certificates_%: .PHONY: identity_% identity_%: $(MAKE) binary-check COMPONENT=identity GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) -.PHONY: inspector_% -inspector_%: - $(MAKE) binary-check COMPONENT=inspector GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) .PHONE: multinode_% multinode_%: multinode-console $(MAKE) binary-check COMPONENT=multinode GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) @@ -423,11 +420,11 @@ multinode_%: multinode-console $(MAKE) binary-check COMPONENT=multinode GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) -COMPONENTLIST := certificates identity inspector multinode satellite storagenode storagenode-updater uplink versioncontrol +COMPONENTLIST := certificates identity multinode satellite storagenode storagenode-updater uplink versioncontrol OSARCHLIST := linux_amd64 linux_arm linux_arm64 windows_amd64 freebsd_amd64 BINARIES := $(foreach C,$(COMPONENTLIST),$(foreach O,$(OSARCHLIST),$C_$O)) .PHONY: binaries -binaries: ${BINARIES} ## Build certificates, identity, inspector, multinode, satellite, storagenode, uplink, versioncontrol and multinode binaries (jenkins) +binaries: ${BINARIES} ## Build certificates, identity, multinode, satellite, storagenode, uplink, versioncontrol and multinode binaries (jenkins) .PHONY: sign-windows-installer sign-windows-installer: diff --git a/cmd/satellite/Dockerfile b/cmd/satellite/Dockerfile index 350b2fed8..e8db83052 100644 --- a/cmd/satellite/Dockerfile +++ b/cmd/satellite/Dockerfile @@ -30,6 +30,5 @@ COPY release/${TAG}/wasm/wasm_exec.js /app/static/wasm/ COPY release/${TAG}/wasm/access.wasm.br /app/static/wasm/ COPY release/${TAG}/wasm/wasm_exec.js.br /app/static/wasm/ COPY release/${TAG}/satellite_linux_${GOARCH:-amd64} /app/satellite -COPY release/${TAG}/inspector_linux_${GOARCH:-amd64} /app/inspector COPY cmd/satellite/entrypoint /entrypoint ENTRYPOINT ["/entrypoint"]