From a59e88337a60cb7f33be1429265ff9ac6f90f111 Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Mon, 27 Jan 2025 16:59:19 +0000 Subject: [PATCH 1/2] fix: git version in Dockerfile Signed-off-by: Enrique Lacal --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cc4fa634bb..4c857ea475 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN apk add make=4.4.1-r2 \ gcc=13.2.1_git20231014-r0 \ build-base=0.5-r3 \ curl=8.11.1-r0 \ - git=2.43.5-r0 + git=2.43.6-r0 WORKDIR /firefly RUN chgrp -R 0 /firefly \ && chmod -R g+rwX /firefly \ From 47fae0ac7707a19f8a4b343c2d30e9ee92f950ee Mon Sep 17 00:00:00 2001 From: Enrique Lacal Date: Wed, 29 Jan 2025 15:12:52 +0000 Subject: [PATCH 2/2] Update .gitignore to ignore those binaries Signed-off-by: Enrique Lacal --- smart_contracts/fabric/custompin-sample/.gitignore | 1 + smart_contracts/fabric/firefly-go/.gitignore | 1 + 2 files changed, 2 insertions(+) diff --git a/smart_contracts/fabric/custompin-sample/.gitignore b/smart_contracts/fabric/custompin-sample/.gitignore index b2a69e9a03..c2bab4fd8e 100644 --- a/smart_contracts/fabric/custompin-sample/.gitignore +++ b/smart_contracts/fabric/custompin-sample/.gitignore @@ -1,2 +1,3 @@ .DS_Store vendor +custompin_sample diff --git a/smart_contracts/fabric/firefly-go/.gitignore b/smart_contracts/fabric/firefly-go/.gitignore index b2a69e9a03..a76ee7d820 100644 --- a/smart_contracts/fabric/firefly-go/.gitignore +++ b/smart_contracts/fabric/firefly-go/.gitignore @@ -1,2 +1,3 @@ .DS_Store vendor +chaincode-go