Update test-network chaincode container versions #1266

bestbeforetoday · 2024-11-05T22:28:30Z

The test-network peer configuration specifies $(TWO_DIGIT_VERSION) as the tag for the Node and Java chaincode containers. For Fabric v3.0, this requests fabric-nodeenv:3.0 and fabric-javaenv:3.0 Docker images to host Node and Java chaincode respectively. These images do not exist, which causes deployment of Node and Java chaincode to fail when using Fabric v3.0. Fabric v3.0 continues to use fabric-nodeenv:2.5 and fabric-javaenv:2.5.

This change updates the test-network peer configuration to explicitly specify 2.5 as the Node and Java chaincode Docker image tags. This is (currently) the correct version for both Fabric v2.5 and Fabric v3.0.

Closes #1267

satota2 · 2024-11-06T04:33:18Z

@bestbeforetoday
Thank you for the update.

I noticed that this update changes the indentation in the YAML files from 2 spaces to 4. Is there a specific reason for this change? Other files appear to be consistently using 2 spaces, so it might be better to align with that convention for consistency. What do you think?

bestbeforetoday · 2024-11-06T08:00:21Z

I think this PR changes the indentation from 4 spaces to the same 2 spaces used in other Yaml files.

satota2 · 2024-11-06T08:31:25Z

@bestbeforetoday
Oh, my apologies! I somehow misunderstood, even though you had already corrected it to 2 spaces. Please disregard my previous comment… I’m a bit embarrassed about the mix-up!

bestbeforetoday · 2024-11-06T08:38:56Z

No problem! I didn't set out to change the whitespace intentionally. I just have my editor set to autoformat on save. If you are happy with the 2 space indentation, the changes are (much) easier to review if you set GitHub's diff view settings to hide whitespace.

satota2

@bestbeforetoday
The updates look good to me. I have corrected the indentation for some of the commented-out configuration values, so please review those adjustments.

test-network/addOrg3/compose/docker/peercfg/core.yaml

satota2 · 2024-11-06T08:35:20Z

test-network/addOrg3/compose/docker/peercfg/core.yaml

+      # Parameters on creating docker container.
+      # Container may be efficiently created using ipam & dns-server for cluster
+      # NetworkMode - sets the networking mode for the container. Supported
+      # standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
+      # Dns - a list of DNS servers for the container to use.
+      # Note:  `Privileged` `Binds` `Links` and `PortBindings` properties of
+      # Docker Host Config are not supported and will not be used if set.
+      # LogConfig - sets the logging driver (Type) and related options
+      # (Config) for Docker. For more info,
+      # https://docs.docker.com/engine/admin/logging/overview/
+      # Note: Set LogConfig using Environment Variables is not supported.
+    hostConfig:


Suggested change

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

hostConfig:

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

hostConfig:

satota2 · 2024-11-06T08:35:37Z

test-network/addOrg3/compose/docker/peercfg/core.yaml

+    hostConfig:
+      NetworkMode: host
+      Dns:
+        # - 192.168.0.1


Suggested change

# - 192.168.0.1

# - 192.168.0.1

satota2 · 2024-11-06T08:52:16Z

test-network/addOrg3/compose/podman/peercfg/core.yaml

+# settings for docker vms
+#   docker:
+#       tls:
+#           enabled: false
+#           ca:
+#               file: docker/ca.crt
+#           cert:
+#               file: docker/tls.crt
+#           key:
+#               file: docker/tls.key


Suggested change

# settings for docker vms

# docker:

# tls:

# enabled: false

# ca:

# file: docker/ca.crt

# cert:

# file: docker/tls.crt

# key:

# file: docker/tls.key

# settings for docker vms

# docker:

# tls:

# enabled: false

# ca:

# file: docker/ca.crt

# cert:

# file: docker/tls.crt

# key:

# file: docker/tls.key

satota2 · 2024-11-06T08:57:01Z

test-network/addOrg3/compose/podman/peercfg/core.yaml

+#     hostConfig:
+#         NetworkMode: host
+#         Dns:
+#            # - 192.168.0.1
+#         LogConfig:
+#             Type: json-file
+#             Config:
+#                 max-size: "50m"
+#                 max-file: "5"
+#         Memory: 2147483648


Suggested change

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

Suggested change

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

satota2 · 2024-11-06T09:04:11Z

test-network/addOrg3/compose/podman/peercfg/core.yaml

+# Enables/disables the standard out/err from chaincode containers for
+# debugging purposes
+#      attachStdout: false
+
+# Parameters on creating docker container.
+# Container may be efficiently created using ipam & dns-server for cluster
+# NetworkMode - sets the networking mode for the container. Supported
+# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
+# Dns - a list of DNS servers for the container to use.
+# Note:  `Privileged` `Binds` `Links` and `PortBindings` properties of
+# Docker Host Config are not supported and will not be used if set.
+# LogConfig - sets the logging driver (Type) and related options
+# (Config) for Docker. For more info,
+# https://docs.docker.com/engine/admin/logging/overview/
+# Note: Set LogConfig using Environment Variables is not supported.


Suggested change

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

# attachStdout: false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

# attachStdout:

# false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

satota2 · 2024-11-06T09:10:52Z

test-network/compose/docker/peercfg/core.yaml

+  # If you utilize external chaincode builders and don't need the default Docker chaincode builder,
+  # the endpoint should be unconfigured so that the peer's Docker health checker doesn't get registered.
+  endpoint:
+    unix:///var/run/docker.sock

    # settings for docker vms


Suggested change

# settings for docker vms

# settings for docker vms

satota2 · 2024-11-06T09:11:52Z

test-network/compose/docker/peercfg/core.yaml

+      # Enables/disables the standard out/err from chaincode containers for
+      # debugging purposes
+    attachStdout:
+      false
+
+      # Parameters on creating docker container.
+      # Container may be efficiently created using ipam & dns-server for cluster
+      # NetworkMode - sets the networking mode for the container. Supported
+      # standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
+      # Dns - a list of DNS servers for the container to use.
+      # Note:  `Privileged` `Binds` `Links` and `PortBindings` properties of
+      # Docker Host Config are not supported and will not be used if set.
+      # LogConfig - sets the logging driver (Type) and related options
+      # (Config) for Docker. For more info,
+      # https://docs.docker.com/engine/admin/logging/overview/
+      # Note: Set LogConfig using Environment Variables is not supported.


Suggested change

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

attachStdout:

false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

attachStdout:

false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

satota2 · 2024-11-06T09:15:27Z

test-network/compose/podman/peercfg/core.yaml

+# settings for docker vms
+#   docker:
+#       tls:
+#           enabled: false
+#           ca:
+#               file: docker/ca.crt
+#           cert:
+#               file: docker/tls.crt
+#           key:
+#               file: docker/tls.key
+
+# Enables/disables the standard out/err from chaincode containers for
+# debugging purposes
+#      attachStdout: false
+
+# Parameters on creating docker container.
+# Container may be efficiently created using ipam & dns-server for cluster
+# NetworkMode - sets the networking mode for the container. Supported
+# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.
+# Dns - a list of DNS servers for the container to use.
+# Note:  `Privileged` `Binds` `Links` and `PortBindings` properties of
+# Docker Host Config are not supported and will not be used if set.
+# LogConfig - sets the logging driver (Type) and related options
+# (Config) for Docker. For more info,
+# https://docs.docker.com/engine/admin/logging/overview/
+# Note: Set LogConfig using Environment Variables is not supported.
+#     hostConfig:
+#         NetworkMode: host
+#         Dns:
+#            # - 192.168.0.1
+#         LogConfig:
+#             Type: json-file
+#             Config:
+#                 max-size: "50m"
+#                 max-file: "5"
+#         Memory: 2147483648



Suggested change

# settings for docker vms

# docker:

# tls:

# enabled: false

# ca:

# file: docker/ca.crt

# cert:

# file: docker/tls.crt

# key:

# file: docker/tls.key

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

# attachStdout: false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

# settings for docker vms

# docker:

# tls:

# enabled: false

# ca:

# file: docker/ca.crt

# cert:

# file: docker/tls.crt

# key:

# file: docker/tls.key

# Enables/disables the standard out/err from chaincode containers for

# debugging purposes

# attachStdout:

# false

# Parameters on creating docker container.

# Container may be efficiently created using ipam & dns-server for cluster

# NetworkMode - sets the networking mode for the container. Supported

# standard values are: `host`(default),`bridge`,`ipvlan`,`none`.

# Dns - a list of DNS servers for the container to use.

# Note: `Privileged` `Binds` `Links` and `PortBindings` properties of

# Docker Host Config are not supported and will not be used if set.

# LogConfig - sets the logging driver (Type) and related options

# (Config) for Docker. For more info,

# https://docs.docker.com/engine/admin/logging/overview/

# Note: Set LogConfig using Environment Variables is not supported.

# hostConfig:

# NetworkMode: host

# Dns:

# # - 192.168.0.1

# LogConfig:

# Type: json-file

# Config:

# max-size: "50m"

# max-file: "5"

# Memory: 2147483648

satota2 · 2024-11-06T09:33:19Z

@bestbeforetoday
Through this PR, I noticed that the original YAML file in the Fabric core repository also uses 4 spaces for indentation.
https://github.com/hyperledger/fabric/blob/main/sampleconfig/core.yaml

So, I plan to submit a separate PR to the Fabric core repository to change this to 2 spaces.
I believe that aligning the indentation between the sample configuration in Fabric core and the configuration in fabric-samples’ test network will be beneficial for future updates and for users when making comparisons.

satota2 · 2024-11-06T10:02:19Z

@bestbeforetoday

No problem! I didn't set out to change the whitespace intentionally. I just have my editor set to autoformat on save. If you are happy with the 2 space indentation, the changes are (much) easier to review if you set GitHub's diff view settings to hide whitespace.

Thank you for your comment! I just saw it, and I appreciate the suggestion—I wasn't aware of that option, so it's very helpful.

So, I plan to submit a separate PR to the Fabric core repository to change this to 2 spaces.

Using this option, the indentation differences may indeed be less noticeable when comparing with the original file. That said, I think I'll still go ahead and submit a PR to adjust the indentation in the original file, leaving it to the maintainers to decide.

The test-network peer configuration specifies $(TWO_DIGIT_VERSION) as the tag for the Node and Java chaincode containers. For Fabric v3.0, this requests fabric-nodeenv:3.0 and fabric-javaenv:3.0 Docker images to host Node and Java chaincode respectively. These images do not exist, which causes deployment of Node and Java chaincode to fail when using Fabric v3.0. Fabric v3.0 continues to use fabric-nodeenv:2.5 and fabric-javaenv:2.5. This change updates the test-network peer configuration to explicitly specify `2.5` as the Node and Java chaincode Docker image tags. This is (currently) the correct version for both Fabric v2.5 and Fabric v3.0. Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>

bestbeforetoday · 2024-11-06T10:27:59Z

Thank you for taking the time to go through all the formatting. Unfortunately, applying them all can't be done in one go and they are a pain to work through in the GitHub diff editor - I lost my batch updates several times. I have updated this PR to make the minimal changes required to resolve the actual problem being addressed. Formatting can be tackled in a separate PR when I or somebody else has time.

bestbeforetoday · 2024-11-06T10:37:08Z

Given that these files are very similar to the sampleconfig in the main Fabric repo, but are already slightly out-of-date compared to Fabric's version, I wonder if it is worth removing all the problematic commented out sections and comments. Instead, a comment at the top of each file could reference the Fabric sampleconfig. Entirely up to you though.

satota2

Thank you for taking the time to go through all the formatting. Unfortunately, applying them all can't be done in one go and they are a pain to work through in the GitHub diff editor - I lost my batch updates several times. I have updated this PR to make the minimal changes required to resolve the actual problem being addressed. Formatting can be tackled in a separate PR when I or somebody else has time.

@bestbeforetoday
Understood! I’ve reviewed the newly updated commit, and there are no issues with the changes. Thank you for handling this.

satota2 · 2024-11-07T00:05:36Z

Given that these files are very similar to the sampleconfig in the main Fabric repo, but are already slightly out-of-date compared to Fabric's version, I wonder if it is worth removing all the problematic commented out sections and comments. Instead, a comment at the top of each file could reference the Fabric sampleconfig. Entirely up to you though.

Thank you for your comment. As noted below, I’ve submitted a patch to fix the indentation in the original files:
hyperledger/fabric#5050

Once this is merged, I think it would be a good approach to update the various files in test-network based on the original file, taking your suggestion into consideration as well.

bestbeforetoday marked this pull request as ready for review November 5, 2024 22:54

bestbeforetoday requested a review from a team as a code owner November 5, 2024 22:54

satota2 self-requested a review November 6, 2024 04:33

satota2 reviewed Nov 6, 2024

View reviewed changes

satota2 mentioned this pull request Nov 6, 2024

Update YAML indentation to 2 spaces in sampleconfig for consistency hyperledger/fabric#5050

Merged

bestbeforetoday force-pushed the node-javaenv branch from d9cc00f to 41ce1e1 Compare November 6, 2024 10:24

satota2 approved these changes Nov 6, 2024

View reviewed changes

satota2 merged commit 8136eb4 into hyperledger:main Nov 6, 2024
38 checks passed

bestbeforetoday deleted the node-javaenv branch November 6, 2024 10:40

satota2 mentioned this pull request Nov 7, 2024

Update chaincode container versions in k8s samples #1268

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update test-network chaincode container versions #1266

Update test-network chaincode container versions #1266

bestbeforetoday commented Nov 5, 2024 •

edited

Loading

satota2 commented Nov 6, 2024 •

edited

Loading

bestbeforetoday commented Nov 6, 2024

satota2 commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024 •

edited

Loading

satota2 left a comment

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 Nov 6, 2024

satota2 commented Nov 6, 2024

satota2 commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024

satota2 left a comment •

edited

Loading

satota2 commented Nov 7, 2024

Update test-network chaincode container versions #1266

Update test-network chaincode container versions #1266

Conversation

bestbeforetoday commented Nov 5, 2024 • edited Loading

satota2 commented Nov 6, 2024 • edited Loading

bestbeforetoday commented Nov 6, 2024

satota2 commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024 • edited Loading

satota2 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

satota2 commented Nov 6, 2024

satota2 commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024

bestbeforetoday commented Nov 6, 2024

satota2 left a comment • edited Loading

Choose a reason for hiding this comment

satota2 commented Nov 7, 2024

bestbeforetoday commented Nov 5, 2024 •

edited

Loading

satota2 commented Nov 6, 2024 •

edited

Loading

bestbeforetoday commented Nov 6, 2024 •

edited

Loading

satota2 left a comment •

edited

Loading