Skip to content

Updated pb2 by make command#7376

Closed
ShahanaFarooqui wants to merge 1 commit intoElementsProject:masterfrom
ShahanaFarooqui:docker-version-modded-pb2
Closed

Updated pb2 by make command#7376
ShahanaFarooqui wants to merge 1 commit intoElementsProject:masterfrom
ShahanaFarooqui:docker-version-modded-pb2

Conversation

@ShahanaFarooqui
Copy link
Collaborator

Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Reference:
#7370 (comment)

Dockerfile's make command for lightning, auto generated contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files with a comment removal, which resulted in modded version for CLN.

If these files are identical on all setups then this PR should resolve the issue. But if not, then can we add them to .gitignore?

Changelog-None.

@ShahanaFarooqui ShahanaFarooqui requested a review from cdecker June 7, 2024 04:44
Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Reference:
ElementsProject#7370 (comment)

Dockerfile's make command for lightning, auto generated contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files with a comment removal, which resulted in modded version for CLN.

If these files are identical on all setups then this PR should resolve the issue. But if not, then can we add them to .gitignore?

Changelog-None.
@cdecker
Copy link
Member

cdecker commented Jun 11, 2024

This divergence happens if poetry install is not called before the run by the way. Installing would ensure that the same grpcio-tools version is used and the same protobuf version.

ShahanaFarooqui added a commit to ShahanaFarooqui/lightning that referenced this pull request Jun 12, 2024
Issue: Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Root cause: Dockerfile builder was running different versions of grpcio-tools and protobuf. It resulted in auto generated update of contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files.

Solution: Run `poetry install` before make in the dockerfile's builder stage to ensure that the grpcio-tools and protobuf versions are the same.

References:
ElementsProject#7370 (comment)
ElementsProject#7376 (comment)

Changelog-None.
@ShahanaFarooqui
Copy link
Collaborator Author

Thanks for the suggestion. I created another PR #7387 running poetry install before executing make command in the builder stage.

Closing this PR now.

ShahanaFarooqui added a commit to ShahanaFarooqui/lightning that referenced this pull request Jun 12, 2024
Issue: Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Root cause: Dockerfile builder was running different versions of grpcio-tools and protobuf. It resulted in auto generated update of contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files.

Solution: Run `poetry install` before make in the dockerfile's builder stage to ensure that the grpcio-tools and protobuf versions are the same.

References:
ElementsProject#7370 (comment)
ElementsProject#7376 (comment)

Changelog-None.
ShahanaFarooqui added a commit to ShahanaFarooqui/lightning that referenced this pull request Jun 12, 2024
Issue: Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Root cause: Dockerfile builder was running different versions of grpcio-tools and protobuf. It resulted in auto generated update of contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files.

Solution: Run `poetry install` before make in the dockerfile's builder stage to ensure that the grpcio-tools and protobuf versions are the same.

References:
ElementsProject#7370 (comment)
ElementsProject#7376 (comment)

Changelog-None.
ShahanaFarooqui added a commit to ShahanaFarooqui/lightning that referenced this pull request Jun 12, 2024
Issue: Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Root cause: Dockerfile builder was running different versions of grpcio-tools and protobuf. It resulted in auto generated update of contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files.

Solution: Run `poetry install` before make in the dockerfile's builder stage to ensure that the grpcio-tools and protobuf versions are the same.

References:
ElementsProject#7370 (comment)
ElementsProject#7376 (comment)

Changelog-None.
rustyrussell pushed a commit that referenced this pull request Jun 13, 2024
Issue: Docker images for v24.05 were built on clean lightning directory and the published image should be running on v24.05 but it is running as v24.05-modded.

Root cause: Dockerfile builder was running different versions of grpcio-tools and protobuf. It resulted in auto generated update of contrib/pyln-grpc-proto/pyln/grpc/node_pb2.py and contrib/pyln-grpc-proto/pyln/grpc/primitive_pb2.py files.

Solution: Run `poetry install` before make in the dockerfile's builder stage to ensure that the grpcio-tools and protobuf versions are the same.

References:
#7370 (comment)
#7376 (comment)

Changelog-None.
ShahanaFarooqui added a commit to s373nZ/lightning that referenced this pull request Oct 12, 2024
- Locked grpcio-tools version to fix dirty tree issue. Ref: ElementsProject#7376 (comment)

- Updated python version to 3.10 for future proofing

- Added manual dispatch for github action
@ShahanaFarooqui ShahanaFarooqui mentioned this pull request Oct 12, 2024
4 tasks
s373nZ pushed a commit to s373nZ/lightning that referenced this pull request Oct 15, 2024
- Locked grpcio-tools version to fix dirty tree issue. Ref: ElementsProject#7376 (comment)

- Updated python version to 3.10 for future proofing

- Added manual dispatch for github action
s373nZ pushed a commit to s373nZ/lightning that referenced this pull request Oct 15, 2024
- Locked grpcio-tools version to fix dirty tree issue. Ref: ElementsProject#7376 (comment)

- Updated python version to 3.10 for future proofing

- Added manual dispatch for github action
ShahanaFarooqui added a commit that referenced this pull request Nov 1, 2024
- Locked grpcio-tools version to fix dirty tree issue. Ref: #7376 (comment)

- Updated python version to 3.10 for future proofing

- Added manual dispatch for github action
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants