[FAB-10881] Update base image to 0.4.10

Change-Id: Ibf54129221462c91fe41f320d50d0ed7d9b4fbb3
Signed-off-by: Troy Ronda <troy@troyronda.com>

Makefile

@@ -30,7 +30,7 @@ DOCKER_COMPOSE_CMD ?= docker-compose
 FABRIC_STABLE_VERSION           := 1.1.0
 FABRIC_STABLE_VERSION_MINOR     := 1.1
 FABRIC_STABLE_VERSION_MAJOR     := 1
-FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.6
+FABRIC_BASEIMAGE_STABLE_VERSION := 0.4.10
 
 FABRIC_PRERELEASE_VERSION       := 1.2.0-rc1
 FABRIC_PREV_VERSION             := 1.0.6
@@ -51,11 +51,11 @@ FABRIC_BASE_VERSION  ?= $(FABRIC_BASEIMAGE_STABLE_VERSION)
 
 # Fabric base docker image (overridable)
 FABRIC_BASE_IMAGE   ?= hyperledger/fabric-baseimage
-FABRIC_BASE_TAG     ?= $(ARCH)-$(FABRIC_BASE_VERSION)
+FABRIC_BASE_TAG     ?= $(FABRIC_ARCH)-$(FABRIC_BASE_VERSION)
 
 # Fabric tools docker image (overridable)
 FABRIC_TOOLS_IMAGE ?= hyperledger/fabric-tools
-FABRIC_TOOLS_TAG   ?= $(ARCH)-$(FABRIC_TOOLS_VERSION)
+FABRIC_TOOLS_TAG   ?= $(FABRIC_ARCH)-$(FABRIC_TOOLS_VERSION)
 
 # Fabric docker registries (overridable)
 FABRIC_RELEASE_REGISTRY     ?=
@@ -131,8 +131,8 @@ endif
 
 # Fabric tool docker tags at code levels
 FABRIC_TOOLS_STABLE_TAG     := $(ARCH)-$(FABRIC_STABLE_VERSION)
-FABRIC_TOOLS_PREV_TAG       := $(ARCH)-$(FABRIC_PREV_VERSION)
-FABRIC_TOOLS_PRERELEASE_TAG := $(ARCH)-$(FABRIC_PRERELEASE_VERSION)
+FABRIC_TOOLS_PREV_TAG       := $(FABRIC_ARCH)-$(FABRIC_PREV_VERSION)
+FABRIC_TOOLS_PRERELEASE_TAG := $(FABRIC_ARCH)-$(FABRIC_PRERELEASE_VERSION)
 FABRIC_TOOLS_DEVSTABLE_TAG  := stable
 
 # The version of dep that will be installed by depend-install (or in the CI)
@@ -165,16 +165,21 @@ export FABRIC_SDKGO_DEPEND_INSTALL=false
 FABRIC_SDK_POPULATE_VENDOR := false
 endif
 
-# DEVSTABLE images are currently only x86_64
+FABRIC_ARCH := $(ARCH)
+
 ifneq ($(ARCH),x86_64)
+# DEVSTABLE images are currently only x86_64
 FABRIC_DEVSTABLE_INTTEST := false
+else
+# Recent Fabric builds follow GOARCH (e.g., amd64)
+FABRIC_ARCH := amd64
 endif
 
 # Global environment exported for scripts
 export GO_CMD
 export GO_DEP_CMD
 export ARCH
-export BASE_ARCH=$(ARCH)
+export FABRIC_ARCH
 export GO_LDFLAGS
 export GO_DEP_COMMIT
 export GO_MOCKGEN_COMMIT

test/fixtures/dockerenv/.env

@@ -8,12 +8,9 @@
 # Fabric fixtures. The images and tags can be overridden using environment
 # variables. See docker compose documentation.
 
-# Default architecture for fabric images (excluding baseos & baseimage)
-ARCH=x86_64
-ARCH_SEP=-
-
-# Default architecture for fabric base images
-BASE_ARCH=x86_64
+# Default architecture for fabric images
+FABRIC_ARCH=x86_64
+FABRIC_ARCH_SEP=-
 
 CORE_PEER_NETWORKID=fabsdkgo
 COMPOSE_PROJECT_NAME=fabsdkgo
@@ -27,9 +24,9 @@ FABRIC_CA_FIXTURE_TAG=1.1.0
 FABRIC_ORDERER_FIXTURE_TAG=1.1.0
 FABRIC_PEER_FIXTURE_TAG=1.1.0
 FABRIC_BUILDER_FIXTURE_TAG=1.1.0
-FABRIC_COUCHDB_FIXTURE_TAG=0.4.6
-FABRIC_BASEOS_FIXTURE_TAG=0.4.6
-FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.6
+FABRIC_COUCHDB_FIXTURE_TAG=0.4.10
+FABRIC_BASEOS_FIXTURE_TAG=0.4.10
+FABRIC_BASEIMAGE_FIXTURE_TAG=0.4.10
 
 FABRIC_CA_FIXTURE_IMAGE=hyperledger/fabric-ca
 FABRIC_ORDERER_FIXTURE_IMAGE=hyperledger/fabric-orderer

test/fixtures/dockerenv/docker-compose-expired-orderer.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose-expired-peer.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose-nopkcs11-test.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose-revoked.yaml

@@ -8,7 +8,7 @@ version: '2'
 services:
 
   integration-tests:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEIMAGE_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEIMAGE_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEIMAGE_FIXTURE_TAG}
     environment:
       - GO_TAGS
       - GO_TESTFLAGS

test/fixtures/dockerenv/docker-compose.yaml

@@ -7,7 +7,7 @@ version: '2'
 
 services:
   org1ca1:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com
@@ -33,7 +33,7 @@ services:
           - ca.org1.example.com
 
   org2ca1:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_CA_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_CA_FIXTURE_TAG}
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca.org2.example.com
@@ -59,7 +59,7 @@ services:
           - ca.org2.example.com
 
   orderer1:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_ORDERER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_ORDERER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_ORDERER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_ORDERER_FIXTURE_TAG}
     environment:
       - ORDERER_GENERAL_LOGLEVEL=debug
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -91,7 +91,7 @@ services:
           - orderer.example.com
 
   org1peer1:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org1.example.com
@@ -101,8 +101,8 @@ services:
       # - CORE_CHAINCODE_STARTUPTIMEOUT=30s
       - CORE_CHAINCODE_LOGGING_SHIM=debug
       - CORE_CHAINCODE_LOGGING_LEVEL=debug
-      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
-      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
+      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
+      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEOS_FIXTURE_TAG}
       ## the following setting redirects chaincode container logs to the peer container logs
       - CORE_VM_DOCKER_ATTACHSTDOUT=true
       - CORE_PEER_LOCALMSPID=Org1MSP
@@ -152,7 +152,7 @@ services:
       - golangruntime
 
   org1peer2:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer1.org1.example.com
@@ -162,8 +162,8 @@ services:
       # - CORE_CHAINCODE_STARTUPTIMEOUT=30s
       - CORE_CHAINCODE_LOGGING_SHIM=debug
       - CORE_CHAINCODE_LOGGING_LEVEL=debug
-      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
-      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
+      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
+      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEOS_FIXTURE_TAG}
       ## the following setting redirects chaincode container logs to the peer container logs
       - CORE_VM_DOCKER_ATTACHSTDOUT=true
       - CORE_PEER_LOCALMSPID=Org1MSP
@@ -213,7 +213,7 @@ services:
       - golangruntime
 
   org2peer1:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer0.org2.example.com
@@ -224,8 +224,8 @@ services:
       # - CORE_CHAINCODE_STARTUPTIMEOUT=30s
       - CORE_CHAINCODE_LOGGING_SHIM=debug
       - CORE_CHAINCODE_LOGGING_LEVEL=debug
-      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
-      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
+      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
+      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEOS_FIXTURE_TAG}
       ## the following setting redirects chaincode container logs to the peer container logs
       - CORE_VM_DOCKER_ATTACHSTDOUT=true
       - CORE_PEER_LOCALMSPID=Org2MSP
@@ -275,7 +275,7 @@ services:
       - golangruntime
 
   org2peer2:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_PEER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_PEER_FIXTURE_TAG}
     environment:
       - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock
       - CORE_PEER_ID=peer1.org2.example.com
@@ -286,8 +286,8 @@ services:
       # - CORE_CHAINCODE_STARTUPTIMEOUT=30s
       - CORE_CHAINCODE_LOGGING_SHIM=debug
       - CORE_CHAINCODE_LOGGING_LEVEL=debug
-      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
-      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
+      - CORE_CHAINCODE_BUILDER=${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
+      - CORE_CHAINCODE_GOLANG_RUNTIME=${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEOS_FIXTURE_TAG}
       ## the following setting redirects chaincode container logs to the peer container logs
       - CORE_VM_DOCKER_ATTACHSTDOUT=true
       - CORE_PEER_LOCALMSPID=Org2MSP
@@ -341,14 +341,14 @@ services:
 
  # builder is only here to create a dependency on the image (not used as part of compose)
   builder:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${ARCH}${ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BUILDER_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BUILDER_FIXTURE_TAG}
     command: tail -F anything
     logging:
       driver: none
 
  # golangruntime is only here to create a dependency on the image (not used as part of compose)
   golangruntime:
-    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${BASE_ARCH}-${FABRIC_BASEOS_FIXTURE_TAG}
+    image: ${FABRIC_DOCKER_REGISTRY}${FABRIC_BASEOS_FIXTURE_IMAGE}:${FABRIC_ARCH}${FABRIC_ARCH_SEP}${FABRIC_BASEOS_FIXTURE_TAG}
     command: tail -F anything
     logging:
       driver: none

test/fixtures/dockerenv/prev-env.sh

@@ -15,10 +15,11 @@ export FABRIC_ORDERER_FIXTURE_TAG="1.0.6"
 export FABRIC_PEER_FIXTURE_TAG="1.0.6"
 export FABRIC_BUILDER_FIXTURE_TAG="1.0.6"
 
-# Using default BASSEOS image (until there is a compatibility issue)
-# export FABRIC_BASEOS_FIXTURE_TAG="0.4.6"
-# export FABRIC_BASEIMAGE_FIXTURE_TAG="0.4.6"
-# export FABRIC_COUCHDB_FIXTURE_TAG="0.4.6"
+# Using old style base OS arch tags for 1.0.x
+export FABRIC_ARCH=${ARCH}
+export FABRIC_BASEOS_FIXTURE_TAG="0.4.6"
+export FABRIC_BASEIMAGE_FIXTURE_TAG="0.4.6"
+export FABRIC_COUCHDB_FIXTURE_TAG="0.4.6"
 
 # override configuration that loads crypto-config
 export FABRIC_SDK_CLIENT_CRYPTOCONFIG_PATH='${GOPATH}'"/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/fabric/${FABRIC_CRYPTOCONFIG_VERSION}/crypto-config"

test/fixtures/softhsm2/Dockerfile

@@ -10,7 +10,6 @@ FROM ${FABRIC_BASE_IMAGE}:${FABRIC_BASE_TAG}
 
 ENV GOPATH=/opt/gopath \
     GOROOT=/opt/go \
-    GO_VERSION=1.9.2 \
     PATH=$PATH:/opt/go/bin:/opt/gopath/bin
 
 COPY test/fixtures/softhsm2/install-softhsm2.sh /tmp

test/fixtures/softhsm2/install-softhsm2.sh

@@ -9,8 +9,6 @@ set -xe
 ARCH=`uname -m`
 
 if [ $ARCH = "s390x" ]; then
-  # TODO: Use a base image that doesn't have apt issues.
-  sed -i '/security.debian.org/d' /etc/apt/sources.list
   echo "deb http://ftp.us.debian.org/debian sid main" >> /etc/apt/sources.list
 fi