Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
fix couchdb path in release file
Browse files Browse the repository at this point in the history
  • Loading branch information
mirioeggmann committed Mar 4, 2021
1 parent ec75a59 commit 6cdb518
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
spec:
serviceAccountName: peer # run peer as service account
containers:
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.7 # use an appropriate image and tag
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.8 # use an appropriate image and tag
- name: K8SCC_CFGFILE
value: "/opt/k8scc/k8scc.yaml" # this points to the default configuration file
volumeMounts:
Expand All @@ -59,8 +59,8 @@ The version tags are defined as follows This allows to create (hotfix) branches
- `v{{ k8scc version }}`: tag scheme used internally for k8scc development

Examples:
- `2.2.1-k8scc0.0.7`: Peer v2.2.1, k8scc v0.0.7
- `v0.0.7`: k8scc v0.0.7, peer at undefined version
- `2.2.1-k8scc0.0.8`: Peer v2.2.1, k8scc v0.0.8
- `v0.0.8`: k8scc v0.0.8, peer at undefined version

### Releasing
If you want to release a new version of `k8scc`, do the following:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: peer
containers:
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.7
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.8
name: fabric-peer
workingDir: /etc/hyperledger/fabric/
env:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: peer
containers:
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.7
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.8
name: fabric-peer
workingDir: /etc/hyperledger/fabric/
env:
Expand Down
2 changes: 1 addition & 1 deletion example/peer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
spec:
serviceAccountName: peer
containers:
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.7
- image: postfinance/hlfabric-k8scc:2.2.1-k8scc0.0.8
name: fabric-peer
workingDir: /etc/hyperledger/fabric/
env:
Expand Down
10 changes: 6 additions & 4 deletions release.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ func Release(ctx context.Context, cfg Config) error {
return errors.New("release requires exactly two arguments")
}

// bld dir from external builder
sourceDir := os.Args[1]
outputDir := os.Args[2]

// Copy META-INF, if available
metaInf := filepath.Join(sourceDir, "statedb")
if _, err := os.Stat(metaInf); !os.IsNotExist(err) {
err = cpy.Copy(metaInf, outputDir)
// Copy statedb from bld dir, if available
statedbSrc := filepath.Join(sourceDir, "statedb")
statedbDest := filepath.Join(outputDir, "statedb");
if _, err := os.Stat(statedbSrc); !os.IsNotExist(err) {
err = cpy.Copy(statedbSrc, statedbDest)
if err != nil {
return errors.Wrap(err, "accessing statedb folder")
}
Expand Down

0 comments on commit 6cdb518

Please sign in to comment.