Deprecated fabric tools image

Signed-off-by: Sam Yuan <yy19902439@126.com>
hyperledger · May 1, 2024 · bbf090c · bbf090c
1 parent c2bc505
commit bbf090c
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 18 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.9
 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/docs/source/channel_update_tutorial.rst b/docs/source/channel_update_tutorial.rst
@@ -174,11 +174,9 @@ This Docker Compose file has been configured to bridge across our initial networ
 so that the Org3 peer resolves with the existing peers and ordering
 node of the test network.
 
-.. note:: the `./addOrg3.sh up` command uses a `fabric-tools` CLI container to perform
-          the channel configuration update process demonstrated below. This is to avoid the
-          `jq` dependency requirement for first-time users. However, it is recommended to
-          follow the process below directly on your local machine instead of using the unnecessary
-          CLI container.
+.. note:: the `./addOrg3.sh up` command uses a `jq` CLI to perform
+          the channel configuration update process demonstrated. It is recommended to
+          follow the process below directly on your local machine.
 
 Fetch the Configuration
 ~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/docs/source/create_channel/create_channel_test_net.md b/docs/source/create_channel/create_channel_test_net.md
@@ -46,9 +46,7 @@ Creating volume "net_peer0.org2.example.com" with default driver
 Creating peer0.org2.example.com ... done
 Creating orderer.example.com    ... done
 Creating peer0.org1.example.com ... done
-Creating cli                    ... done
 CONTAINER ID   IMAGE                               COMMAND             CREATED         STATUS                  PORTS                                            NAMES
-1667543b5634   hyperledger/fabric-tools:latest     "/bin/bash"         1 second ago    Up Less than a second                                                    cli
 b6b117c81c7f   hyperledger/fabric-peer:latest      "peer node start"   2 seconds ago   Up 1 second             0.0.0.0:7051->7051/tcp                           peer0.org1.example.com
 703ead770e05   hyperledger/fabric-orderer:latest   "orderer"           2 seconds ago   Up Less than a second   0.0.0.0:7050->7050/tcp, 0.0.0.0:7053->7053/tcp   orderer.example.com
 718d43f5f312   hyperledger/fabric-peer:latest      "peer node start"   2 seconds ago   Up 1 second             7051/tcp, 0.0.0.0:9051->9051/tcp                 peer0.org2.example.com

diff --git a/docs/source/prereqs.md b/docs/source/prereqs.md
@@ -79,8 +79,7 @@ go version # => go1.21.9 darwin/amd64
 
 ### JQ
 
-Optional: Install the latest version of [jq](https://stedolan.github.io/jq/download/) if it is not already installed
-(only required for the tutorials related to channel configuration transactions).
+Install the latest version of [jq](https://stedolan.github.io/jq/download/) if it is not already installed, it's required for the tutorials that utilize the fabric-samples test-network.
 
 ```shell
 brew install jq

diff --git a/docs/source/test_network.md b/docs/source/test_network.md
@@ -113,9 +113,7 @@ Creating volume "net_peer0.org2.example.com" with default driver
 Creating peer0.org2.example.com ... done
 Creating orderer.example.com    ... done
 Creating peer0.org1.example.com ... done
-Creating cli                    ... done
 CONTAINER ID   IMAGE                               COMMAND             CREATED         STATUS                  PORTS                                            NAMES
-1667543b5634   hyperledger/fabric-tools:latest     "/bin/bash"         1 second ago    Up Less than a second                                                    cli
 b6b117c81c7f   hyperledger/fabric-peer:latest      "peer node start"   2 seconds ago   Up 1 second             0.0.0.0:7051->7051/tcp                           peer0.org1.example.com
 703ead770e05   hyperledger/fabric-orderer:latest   "orderer"           2 seconds ago   Up Less than a second   0.0.0.0:7050->7050/tcp, 0.0.0.0:7053->7053/tcp   orderer.example.com
 718d43f5f312   hyperledger/fabric-peer:latest      "peer node start"   2 seconds ago   Up 1 second             7051/tcp, 0.0.0.0:9051->9051/tcp                 peer0.org2.example.com

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)