Skip to content

Commit 567b99a

Browse files
authored
Merge pull request #262 from mbwhite/fix-docker-image-version
Fix the docker image version to 2.5
2 parents d1621af + 9540c04 commit 567b99a

File tree

4 files changed

+22
-10
lines changed

4 files changed

+22
-10
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ jobs:
2020
distribution: 'temurin'
2121
java-version: '11'
2222
cache: 'gradle'
23-
- run: ./gradlew build --no-daemon

CONTRIBUTING.md

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ Here are a few guidelines to help you contribute successfully...
88

99
## Issues
1010

11-
All issues are tracked in the issues tab in github. If you find a bug which we don't already know about, you can help us by creating a new issue describing the problem. Please include as much detail as possible to help us track down the cause.
12-
13-
## Fixes
14-
15-
If you want to begin contributing code, looking through our open issues is a good way to start. Try looking for recent issues with detailed descriptions first, or ask us on Discord if you're unsure which issue to choose.
11+
All issues are tracked in the issues tab in github. If you find a bug which we don't already know about, you can help us by creating a new issue describing the problem. Please include as much detail as possible to help us track down the cause.If you want to begin contributing code, looking through our open issues is a good way to start. Try looking for recent issues with detailed descriptions first, or ask us on Discord if you're unsure which issue to choose.
1612

1713
## Enhancements
1814

@@ -42,6 +38,23 @@ See our [Code of Conduct Guidelines](../blob/main/CODE_OF_CONDUCT.md).
4238

4339
Should you have any questions or concerns, please reach out to one of the project's [Maintainers](../blob/main/MAINTAINERS.md).
4440

41+
42+
## How to work with the Codebase
43+
44+
Some useful gradle commands to help with building. You can add or remove the `--no-daemon` and `-x dependencyCheckAnalyze` as you wish; depending on the performance of you local machine.
45+
46+
```
47+
# build everything , but skip the (slow) dependency checks
48+
./gradlew --no-daemon build -x dependencyCheckAnalyze
49+
50+
# clean up to force tests and compile to rerun
51+
./gradlew clean cleanTest
52+
./gradlew --no-daemon :fabric-chaincode-shim:build -x dependencyCheckAnalyze
53+
54+
# build docker image
55+
./gradlew :fabric-chaincode-docker:buildImage
56+
```
57+
4558
## Hyperledger Fabric
4659

4760
See the

ci/azure-pipelines.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ schedules:
1818
trigger:
1919
branches:
2020
include:
21-
- "main"
21+
- "release-2.5"
2222
tags:
2323
include:
2424
- "*"
@@ -40,7 +40,7 @@ variables:
4040
- name: PUSH_VERSION
4141
value: stable
4242
- name: FABRIC_VERSION
43-
value: latest
43+
value: 2.5-stable
4444

4545
pool:
4646
vmImage: "ubuntu-latest"

fabric-chaincode-integration-test/getDockerImages.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
#
55
# SPDX-License-Identifier: Apache-2.0
66
#
7-
set -euo pipefail
7+
set -xeuo pipefail
88

9-
version=${FABRIC_VERSION:-latest}
9+
version=${FABRIC_VERSION:-2.5-stable}
1010
artifactory_url=hyperledger-fabric.jfrog.io
1111

1212
for image in peer orderer ca tools; do

0 commit comments

Comments
 (0)