Merge "[FAB-1648] Install SoftHSM for testing PKCS11 CSP"

Makefile

@@ -192,7 +192,8 @@ build/image/testenv/payload: build/gotools.tar.bz2 \
  orderer/orderer.yaml \
  build/docker/bin/peer \
  peer/core.yaml \
- build/msp-sampleconfig.tar.bz2
+ build/msp-sampleconfig.tar.bz2 \
+ images/testenv/install-softhsm2.sh
 build/image/runtime/payload: build/docker/busybox
 build/image/zookeeper/payload: images/zookeeper/docker-entrypoint.sh
 build/image/kafka/payload: images/kafka/docker-entrypoint.sh

images/testenv/Dockerfile.in

@@ -21,5 +21,9 @@ ADD payload/msp-sampleconfig.tar.bz2 $PEER_CFG_PATH
 COPY payload/orderer /usr/local/bin
 COPY payload/peer /usr/local/bin
 
+# softhsm2
+COPY payload/install-softhsm2.sh /tmp
+RUN bash /tmp/install-softhsm2.sh && rm -f install-softhsm2.sh
+
 # typically, this is mapped to a developer's dev environment
 WORKDIR /opt/gopath/src/github.com/hyperledger/fabric

images/testenv/install-softhsm2.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+ARCH=`uname -m`
+
+if [ $ARCH = "s390x" ]; then
+ echo "deb http://ftp.us.debian.org/debian sid main" >> /etc/apt/sources.list
+fi
+
+# Install softhsm2 package
+apt-get update
+apt-get -y install softhsm2
+
+# Create tokens directory
+mkdir -p /var/lib/softhsm/tokens/
+
+#Initialize token
+softhsm2-util --init-token --slot 0 --label "ForFabric" --so-pin 1234 --pin 98765432