Skip to content

Commit 9eb3f4b

Browse files
fix: apply requested changes to PR
Signed-off-by: CatarinaPedreira <[email protected]>
1 parent a1fa306 commit 9eb3f4b

File tree

7 files changed

+11
-35
lines changed

7 files changed

+11
-35
lines changed

.cspell.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"Bools",
1717
"cafile",
1818
"caio",
19-
"catarinapedreira",
2019
"cccs",
2120
"ccid",
2221
"cids",

packages/cactus-test-tooling/src/main/typescript/public-api.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@ export {
131131
RustcContainer,
132132
} from "./rustc-container/rustc-container";
133133

134+
export {
135+
ISubstrateTestLedgerOptions,
136+
SubstrateTestLedger,
137+
} from "./substrate-test-ledger/substrate-test-ledger";
138+
134139
export { RustcBuildCmd } from "./rustc-container/rustc-build-cmd";
135140

136141
export { Streams } from "./common/streams";

packages/cactus-test-tooling/src/main/typescript/substrate-test-ledger/substrate-test-ledger.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ export class SubstrateTestLedger {
5353
this.publishAllPorts = opts.publishAllPorts;
5454
this._containerId = Optional.empty();
5555
this.imageName =
56-
opts.imageName || "ghcr.io/hyperledger/cactus-substrate-test-ledger";
57-
this.imageTag = opts.imageTag || "0.0.1";
56+
opts.imageName || "ghcr.io/hyperledger/cactus-substrate-all-in-one";
57+
this.imageTag = opts.imageTag || "2021-09-24---feat-1274";
5858
this.imageFqn = `${this.imageName}:${this.imageTag}`;
5959
this.envVars = opts.envVars || new Map();
6060
this.emitContainerLogs = Bools.isBooleanStrict(opts.emitContainerLogs)
@@ -75,7 +75,7 @@ export class SubstrateTestLedger {
7575
public async start(omitPull = false): Promise<Container> {
7676
const docker = new Docker();
7777
if (this.containerId.isPresent()) {
78-
this.log.warn(`Container ID provided. Will not start new one.`);
78+
this.log.debug(`Container ID provided. Will not start new one.`);
7979
const container = docker.getContainer(this.containerId.get());
8080
return container;
8181
}
@@ -108,7 +108,7 @@ export class SubstrateTestLedger {
108108
HostConfig: {
109109
AutoRemove: true,
110110
PublishAllPorts: this.publishAllPorts,
111-
Privileged: true,
111+
Privileged: false,
112112
PortBindings: {
113113
"9944/tcp": [{ HostPort: "9944" }],
114114
},

packages/cactus-test-tooling/src/test/typescript/integration/substrate/substrate-test-ledger-constructor.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ test(testCase, async (t: Test) => {
1616
const options = {
1717
publishAllPorts: true,
1818
logLevel: logLevel,
19-
imageName: "ghcr.io/catarinapedreira/substrate-all-in-one",
20-
imageTag: "2021-09-24",
2119
emitContainerLogs: true,
2220
envVars: new Map([
2321
["WORKING_DIR", "/var/www/node-template"],

tools/docker/substrate-all-in-one/Cargo.toml

Lines changed: 0 additions & 9 deletions
This file was deleted.

tools/docker/substrate-all-in-one/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ This image can be used for development of Substrate-based chains (including but
1010

1111
## Usage
1212
```sh
13-
docker run -t -p 9944:9944 --name substrate-contracts-node hyperledger/substrate-all-in-one:latest
13+
docker run -t -p 9944:9944 --name substrate-contracts-node saio:latest
1414
```
1515

1616
## Build
1717

1818
```sh
19-
DOCKER_BUILDKIT=1 docker build -f ./tools/docker/substrate-all-in-one/Dockerfile . --tag hyperledger/substrate-all-in-one
19+
DOCKER_BUILDKIT=1 docker build -f ./tools/docker/substrate-all-in-one/Dockerfile . --tag saio
2020
```

tools/docker/substrate-all-in-one/docker-compose.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)