Remove the fabric-ca docker directory

The Makefile in the fabric-ca repository now generates the docker image with the correct files and in the correct location. This directory should be deleted in order to remove any confusion. Change-Id: I634c4ec8b4f9ba142dde5b5bc33c47193530ee7f Signed-off-by: Latitia M Haskins <[email protected]>
hyperledger · Jan 30, 2017 · 6294c57 · 6294c57
1 parent 8ae8a5f
commit 6294c57
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 135 deletions.
diff --git a/docker/README.md b/docker/README.md
@@ -1,6 +1,6 @@
 # To build a docker image with fabric-ca
 ```sh
-$ docker build fabric-ca -t fabric-ca:latest
+$ cd /path/to/fabric-ca; make docker
 ```
 
 # Setup environment variables (optional)
@@ -20,7 +20,8 @@ $ export CA_KEY_CERTIFICATE=<private key pem file>
 ```
 ## Fabric CA configuration file
 This file contains users, database setup, groups, and signing information)
-default value: fabric-ca.json
+sample values for server: server-config.json, server-psql.json
+sample values for client: client-config.json
 ```sh
 $ export FABRIC_CA_CONFIG=<Fabric CA configuration file>
 ```
@@ -29,7 +30,6 @@ default value: csr.json
 ```sh
 $ export CSR_CONFIG=<CSR configuration file>
 ```
-```
 
 # Certificate private and public files
 If you are using certificates or config files outside of the default values,

diff --git a/docker/docker-compose-fabric-ca.yml b/docker/docker-compose-fabric-ca.yml
@@ -2,7 +2,7 @@ fabric-ca:
    image: hyperledger/fabric-ca
    container_name: fabric-ca
    ports:
-     - "8888:8888"
+     - "7054:7054"
    environment:
      - CA_CERTIFICATE=${CA_CERTIFICATE}
      - CA_KEY_CERTIFICATE=${CA_KEY_CERTIFICATE}
@@ -20,7 +20,7 @@ admin-client:
    volumes:
      - /etc/hyperledger/fabric-ca:/var/hyperledger/fabric-ca/config
      - /.fabric-ca:/var/hyperledger/fabric/.fabric-ca
-   command: sh -c "sleep 5;fabric-ca client enroll admin adminpw http://fabric-ca:8888 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
+   command: sh -c "sleep 5;fabric-ca client enroll admin adminpw http://fabric-ca:7054 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
    links:
      - fabric-ca
 
@@ -32,7 +32,7 @@ sdk-client:
    volumes:
      - /etc/hyperledger/fabric-ca:/var/hyperledger/fabric-ca/config
      - /.fabric-ca:/var/hyperledger/fabric/.fabric-ca
-   command: sh -c "sleep 5;fabric-ca client enroll sdk sdkpw http://fabric-ca:8888 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
+   command: sh -c "sleep 5;fabric-ca client enroll sdk sdkpw http://fabric-ca:7054 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
    links:
      - fabric-ca
 
@@ -44,6 +44,6 @@ bob-client:
    volumes:
      - /etc/hyperledger/fabric-ca:/var/hyperledger/fabric-ca/config
      - /.fabric-ca:/var/hyperledger/fabric/.fabric-ca
-   command: sh -c "sleep 5;fabric-ca client enroll bob bobpw http://fabric-ca:8888 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
+   command: sh -c "sleep 5;fabric-ca client enroll bob bobpw http://fabric-ca:7054 /etc/hyperledger/fabric-ca/$CSR_CONFIG"
    links:
      - fabric-ca
diff --git a/docker/fabric-ca/Dockerfile b/docker/fabric-ca/Dockerfile
diff --git a/docker/fabric-ca/config.json b/docker/fabric-ca/config.json
diff --git a/docker/fabric-ca/csr.json b/docker/fabric-ca/csr.json
diff --git a/docker/fabric-ca/ec-key.pem b/docker/fabric-ca/ec-key.pem
diff --git a/docker/fabric-ca/ec.pem b/docker/fabric-ca/ec.pem