Deprecated fabric tools image

Signed-off-by: Sam Yuan <yy19902439@126.com>
hyperledger · Mar 30, 2024 · 0252b70 · 0252b70
1 parent 8dc37a1
commit 0252b70
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 234 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -82,8 +82,6 @@ jobs:
             CONTEXT: .
           - COMPONENT: orderer
             CONTEXT: .
-          - COMPONENT: tools
-            CONTEXT: .
 
     steps:
       - name: Set up QEMU

diff --git a/Makefile b/Makefile
@@ -41,7 +41,6 @@
 #   - publish-images - publishes release docker images to nexus3 or docker hub.
 #   - release-all - builds release packages for all target platforms
 #   - release - builds release packages for the host platform
-#   - tools-docker[-clean] - ensures the tools container is available[/cleaned]
 #   - unit-test-clean - cleans unit test state (particularly from docker)
 #   - unit-test - runs the go-test based unit tests
 #   - verify - runs unit tests for only the changed package tree
@@ -82,7 +81,7 @@ GO_VER = 1.21.8
 GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
-RELEASE_IMAGES = baseos ccenv orderer peer tools
+RELEASE_IMAGES = baseos ccenv orderer peer
 RELEASE_PLATFORMS = darwin-amd64 darwin-arm64 linux-amd64 linux-arm64 windows-amd64
 TOOLS_EXES = configtxgen configtxlator cryptogen discover ledgerutil osnadmin peer
 
@@ -237,7 +236,6 @@ $(BUILD_DIR)/images/baseos/$(DUMMY):  BUILD_CONTEXT=images/baseos
 $(BUILD_DIR)/images/ccenv/$(DUMMY):   BUILD_CONTEXT=images/ccenv
 $(BUILD_DIR)/images/peer/$(DUMMY):    BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
 $(BUILD_DIR)/images/orderer/$(DUMMY): BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
-$(BUILD_DIR)/images/tools/$(DUMMY):   BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
 
 $(BUILD_DIR)/images/%/$(DUMMY):
 	@echo "Building Docker image $(DOCKER_NS)/fabric-$*"

diff --git a/integration/lifecycle/testdata/chaincode/simple-v14/chaincode.go b/integration/lifecycle/testdata/chaincode/simple-v14/chaincode.go
diff --git a/integration/lifecycle/testdata/docker-compose.yaml b/integration/lifecycle/testdata/docker-compose.yaml
diff --git a/integration/lifecycle/testdata/mycc-0_0-v14.cds b/integration/lifecycle/testdata/mycc-0_0-v14.cds
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -118,7 +118,7 @@ pullDockerImages() {
     command -v ${CONTAINER_CLI} >& /dev/null
     NODOCKER=$?
     if [ "${NODOCKER}" == 0 ]; then
-        FABRIC_IMAGES=(peer orderer ccenv tools)
+        FABRIC_IMAGES=(peer orderer ccenv)
         case "$VERSION" in
         [2-3].*)
             FABRIC_IMAGES+=(baseos)

diff --git a/scripts/install-fabric.sh b/scripts/install-fabric.sh
@@ -225,7 +225,7 @@ pullImages() {
     command -v  ${CONTAINER_CLI}  >& /dev/null
     NODOCKER=$?
     if [ "${NODOCKER}" == 0 ]; then
-        FABRIC_IMAGES=(peer orderer ccenv tools)
+        FABRIC_IMAGES=(peer orderer ccenv)
         case "$VERSION" in
         [2-3].*)
             FABRIC_IMAGES+=(baseos)