Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: easy-to-run docker compose setup for curio+forest #4848

Merged
merged 14 commits into from
Oct 16, 2024

Conversation

lemmih
Copy link
Contributor

@lemmih lemmih commented Oct 7, 2024

Summary of changes

Changes introduced in this pull request:

  • Single docker compose file to running curio+forest.
  • Test the basic configuration in CI (only verifies that the network is running, not that curio can mine).
  • Remove duplicate files.

Reference issue to close (if applicable)

Closes

Other information and links

Change checklist

  • I have performed a self-review of my own code,
  • I have made corresponding changes to the documentation. All new code adheres to the team's documentation standards,
  • I have added tests that prove my fix is effective or that my feature works (if possible),
  • I have made sure the CHANGELOG is up-to-date. All user-facing changes should be reflected in this document.

@lemmih lemmih marked this pull request as ready for review October 14, 2024 11:37
@lemmih lemmih requested a review from a team as a code owner October 14, 2024 11:37
@lemmih lemmih requested review from hanabi1224 and sudo-shashank and removed request for a team October 14, 2024 11:37
@LesnyRumcajs
Copy link
Member

@lemmih WIP or no longer WIP?

@lemmih lemmih changed the title [WIP] chore: easy-to-run docker compose setup for curio+forest chore: easy-to-run docker compose setup for curio+forest Oct 14, 2024
ARG LOTUS_IMAGE
# hadolint ignore=DL3006
FROM ${LOTUS_IMAGE} as lotus-test
FROM golang:1.22.3-bullseye AS curio-builder
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about using debian:bookworm and ubuntu:noble

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like to keep it as similar to the "official" curio build environment as possible.

ARG LOTUS_IMAGE
# hadolint ignore=DL3006
FROM ${LOTUS_IMAGE} as lotus-test
FROM golang:1.22.3-bullseye AS curio-builder
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM golang:1.22.3-bullseye AS curio-builder
FROM golang:1.22-bookworm AS curio-builder

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The curio team uses golang:1.22.3-bullseye, so I hesitate to deviate. If bookworm is better, maybe we can upstream the change.

RUN make build

#####################################
FROM ubuntu:22.04 AS curio-all-in-one
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
FROM ubuntu:22.04 AS curio-all-in-one
FROM ubuntu:24.04 AS curio-all-in-one

ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
RUST_VERSION=1.63.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
RUST_VERSION=1.63.0
RUST_VERSION=1.73.0

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Updated.

@lemmih lemmih enabled auto-merge October 15, 2024 12:15
@@ -0,0 +1,102 @@
#####################################
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this built on every PR and subsequent commits? If so, it'd be better to save it, the same way we do with the Lotus Dockefiles.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll change it to build on demand.

@lemmih
Copy link
Contributor Author

lemmih commented Oct 15, 2024

Will update the docker-compose file once our curio-devnet image has been uploaded to ghcr.

@lemmih lemmih added this pull request to the merge queue Oct 16, 2024
Merged via the queue into main with commit a1bc511 Oct 16, 2024
35 checks passed
@lemmih lemmih deleted the lemmih/curio-one-click-setup branch October 16, 2024 10:52
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.

4 participants