epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-22 17:45:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FAB-16844] Modify pattern for cc images

Browse source 
- remove images that match dev-*
- correcting a dependency

Change-Id: I603dc822260be827ca36677e5c05aa5f196858ae
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
This commit is contained in:
Matthew B. White 2019-10-16 10:56:14 +01:00
parent ca5bcb27ae
commit 9915995df7
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chaincode/fabcar/java/build.gradle
View file

@ -13,7 +13,7 @@ group 'org.hyperledger.fabric.samples'
version '1.0-SNAPSHOT' version '1.0-SNAPSHOT'
dependencies { dependencies {
implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.0.0-SNAPSHOT' implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:1.4.3'
implementation 'com.owlike:genson:1.5' implementation 'com.owlike:genson:1.5'
testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.assertj:assertj-core:3.11.1'

4
first-network/byfn.sh
View file

@ -92,7 +92,7 @@ function askProceed() {
# Obtain CONTAINER_IDS and remove them # Obtain CONTAINER_IDS and remove them
# TODO Might want to make this optional - could clear other containers # TODO Might want to make this optional - could clear other containers
function clearContainers() { function clearContainers() {
CONTAINER_IDS=$(docker ps -a | awk '($2 ~ /dev-peer.*.mycc.*/) {print $1}') CONTAINER_IDS=$(docker ps -a | awk '($2 ~ /dev-peer.*/) {print $1}')
if [ -z "$CONTAINER_IDS" -o "$CONTAINER_IDS" == " " ]; then if [ -z "$CONTAINER_IDS" -o "$CONTAINER_IDS" == " " ]; then
echo "---- No containers available for deletion ----" echo "---- No containers available for deletion ----"
else else
@ -104,7 +104,7 @@ function clearContainers() {
# specifically the following images are often left behind: # specifically the following images are often left behind:
# TODO list generated image naming patterns # TODO list generated image naming patterns
function removeUnwantedImages() { function removeUnwantedImages() {
DOCKER_IMAGE_IDS=$(docker images | awk '($1 ~ /dev-peer.*.mycc.*/) {print $3}') DOCKER_IMAGE_IDS=$(docker images | awk '($1 ~ /dev-peer.*/) {print $3}')
if [ -z "$DOCKER_IMAGE_IDS" -o "$DOCKER_IMAGE_IDS" == " " ]; then if [ -z "$DOCKER_IMAGE_IDS" -o "$DOCKER_IMAGE_IDS" == " " ]; then
echo "---- No images available for deletion ----" echo "---- No images available for deletion ----"
else else