Skip to content

Commit

Permalink
FABC-781 Remove fabric-ca sample
Browse files Browse the repository at this point in the history
Remove unneeded images from Makefile
and remove references to fabric-ca
sample from the docs

Change-Id: I54c7d3c0ef84352164f6a9b2d1358ead2f8ce0ad
Signed-off-by: Gari Singh <[email protected]>
  • Loading branch information
mastersingh24 committed Jan 4, 2019
1 parent bde2d76 commit d79ba64
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 55 deletions.
12 changes: 2 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ GO_SOURCE := $(shell find . -name '*.go')
GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/lib/metadata.%,$(METADATA_VAR))
export GO_LDFLAGS

IMAGES_ALL = $(PROJECT_NAME) $(PROJECT_NAME)-orderer $(PROJECT_NAME)-peer $(PROJECT_NAME)-tools

IMAGES = $(PROJECT_NAME)
FVTIMAGE = $(PROJECT_NAME)-fvt

Expand All @@ -81,7 +79,7 @@ rename: .FORCE

docker: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))

docker-all: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES_ALL))
docker-all: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))

docker-fabric-ca: build/image/fabric-ca/$(DUMMY)

Expand Down Expand Up @@ -156,12 +154,6 @@ build/image/fabric-ca-fvt/payload: \
build/docker/bin/fabric-ca-client \
build/docker/bin/fabric-ca-server \
build/fabric-ca-fvt.tar.bz2
build/image/fabric-ca-orderer/payload: \
build/docker/bin/fabric-ca-client
build/image/fabric-ca-peer/payload: \
build/docker/bin/fabric-ca-client
build/image/fabric-ca-tools/payload: \
build/docker/bin/fabric-ca-client
build/image/%/payload:
@echo "Copying $^ to $@"
mkdir -p $@
Expand Down Expand Up @@ -235,7 +227,7 @@ ci-tests: docker-clean all-tests docker-fvt docs
-docker images -q $(NEXUS_URL)/*:$(STABLE_TAG) | xargs -I '{}' docker rmi -f '{}'
-@rm -rf build/image/$(TARGET) ||:

docker-clean: $(patsubst %,%-docker-clean, $(IMAGES_ALL) $(PROJECT_NAME)-fvt)
docker-clean: $(patsubst %,%-docker-clean, $(IMAGES) $(PROJECT_NAME)-fvt)
@rm -rf build/docker/bin/* ||:

native: fabric-ca-client fabric-ca-server
Expand Down
10 changes: 1 addition & 9 deletions docs/source/users-guide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1635,11 +1635,6 @@ before 2017-09-21T16:39:57-08:00, and that expire after 2017-09-13T16:39:57-08:0
export FABRIC_CA_CLIENT_HOME=~/clientconfig
fabric-ca-client gencrl --caname "" --expireafter 2017-09-13T16:39:57-08:00 --expirebefore 2018-09-13T16:39:57-08:00 --revokedafter 2017-09-13T16:39:57-08:00 --revokedbefore 2017-09-21T16:39:57-08:00 -M ~/msp
The `fabric-samples/fabric-ca <https://github.com/hyperledger/fabric-samples/blob/master/fabric-ca/scripts/run-fabric.sh>`_
sample demonstrates how to generate a CRL that contains certificate of a revoked user and update the channel
msp. It will then demonstrate that querying the channel using the revoked user credentials will result
in an authorization error.

Enabling TLS
~~~~~~~~~~~~

Expand Down Expand Up @@ -1741,10 +1736,7 @@ value of the affiliation (which is 'org1') must be the same in both the
fabric-ca-client register --id.name user1 --id.secret user1pw --id.type user --id.affiliation org1 --id.attrs 'hf.Affiliation=org1:ecert'
For information on the chaincode library API for Attribute-Based Access Control,
see `https://github.com/hyperledger/fabric/tree/release-1.1/core/chaincode/lib/cid/README.md <https://github.com/hyperledger/fabric/tree/release-1.1/core/chaincode/lib/cid/README.md>`_

For an end-to-end sample which demonstrates Attribute-Based Access Control and more,
see `https://github.com/hyperledger/fabric-samples/tree/release-1.1/fabric-ca/README.md <https://github.com/hyperledger/fabric-samples/tree/release-1.1/fabric-ca/README.md>`_
see `https://github.com/hyperledger/fabric/blob/master/core/chaincode/lib/cid/README.md <https://github.com/hyperledger/fabric/blob/master/core/chaincode/lib/cid/README.md>`_

Dynamic Server Configuration Update
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
13 changes: 0 additions & 13 deletions images/fabric-ca-orderer/Dockerfile.in

This file was deleted.

13 changes: 0 additions & 13 deletions images/fabric-ca-peer/Dockerfile.in

This file was deleted.

10 changes: 0 additions & 10 deletions images/fabric-ca-tools/Dockerfile.in

This file was deleted.

0 comments on commit d79ba64

Please sign in to comment.