Skip to content

Commit

Permalink
test(fabric-all-in-one): fix sed write error
Browse files Browse the repository at this point in the history
Upgrade the base images to docker:24.0.2-dind
which contain the fix for the cgroup v2 problems.

The images built locally from this commit are pushed to ghcr.io as

ghcr.io/hyperledger/cactus-fabric-all-in-one:2023-06-16-d436ef26e-issue2464-dind-v24
and
ghcr.io/hyperledger/cactus-fabric2-all-in-one:2023-06-16-d436ef26e-issue2464-dind-v24

Additional context:

The root cause analysis can be found here [1][2]
which states that the solution is to upgrade the
dind image to a version of at least 20.10.16

[1] docker-library/docker#308
[2] testcontainers/dind-drone-plugin#18

Fixes hyperledger#2464

===================================
P.S.:
I'm also sneaking in a hot-fix for the CI failures that are slowing down
everyone else's work with false-negative checks wasting time and resources:
The root package.json codegen, precodegen and postcodegen scripts are now
safe from race conditions (or at least that's the theory for now).

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
  • Loading branch information
petermetz committed Jun 19, 2023
1 parent da99672 commit 6326638
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@
"lint": "eslint '*/*/src/**/*.{js,ts}' --quiet --fix && cspell \"*/*/src/**/*.{js,ts}\"",
"tsc": "tsc --build --verbose",
"codegen": "lerna run codegen",
"precodegen": "yarn codegen:warmup-v5.2.1 & yarn codegen:warmup-v6.3.0",
"codegen:warmup-v5.2.1": "yarn openapi-generator-cli version-manager set 5.2.1 && rm openapitools.json",
"codegen:warmup-v6.3.0": "yarn openapi-generator-cli version-manager set 6.3.0 && rm openapitools.json",
"precodegen": "npm-run-all --parallel --aggregate-output --continue-on-error --print-label --print-name codegen:warmup-*",
"postcodegen": "rm --force --verbose ./openapitools.json",
"codegen:warmup-v5.2.1": "yarn openapi-generator-cli version-manager set 5.2.1",
"codegen:warmup-v6.3.0": "yarn openapi-generator-cli version-manager set 6.3.0",
"watch-other": "lerna run --parallel watch",
"watch-tsc": "tsc --build --watch",
"watch": "run-p -r watch-*",
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/fabric-all-in-one/Dockerfile_v1.4.x
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# We need to use the older, more stable v18 here because of
# https://github.com/docker-library/docker/issues/170
FROM docker:20.10.17
FROM docker:24.0.2-dind

ARG FABRIC_VERSION=1.4.8
ARG CA_VERSION=1.4.9
Expand Down
2 changes: 1 addition & 1 deletion tools/docker/fabric-all-in-one/Dockerfile_v2.x
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# We need to use the older, more stable v18 here because of
# https://github.com/docker-library/docker/issues/170
FROM docker:20.10.3-dind
FROM docker:24.0.2-dind

ARG FABRIC_VERSION=2.2.0
ARG CA_VERSION=1.4.9
Expand Down

0 comments on commit 6326638

Please sign in to comment.