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(dockerfile): bump golang version in lotus.dockerfile #4854

Merged
merged 2 commits into from
Oct 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/devnet-curio/.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CURIO_IMAGE=curio/curio-dev:dev
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-09-20-e9b6503
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-10-07-6d79e1d
FOREST_DATA_DIR=/forest_data
LOTUS_DATA_DIR=/lotus_data
CURIO_REPO_PATH=/var/lib/curio
Expand Down
4 changes: 2 additions & 2 deletions scripts/devnet-curio/lotus.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Lotus binaries image, to be used in the local devnet with Forest.
FROM golang:1.21-bookworm AS lotus-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 2 lotus.dockerfile(s) are identical, should we delete this one?

Copy link
Member

Choose a reason for hiding this comment

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

I think we should re-use the existing one. That said, @lemmih believes both composes will eventually get merged (or rather, the lotus-miner will get replaced by curio). See comments in #4760

FROM golang:1.22-bookworm AS lotus-builder
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update && \
Expand All @@ -13,7 +13,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --profile mini

ENV PATH="/root/.cargo/bin:${PATH}"

RUN git clone --depth 1 --branch v1.29.1 https://github.com/filecoin-project/lotus.git .
RUN git clone --depth 1 --branch v1.29.2 https://github.com/filecoin-project/lotus.git .

# https://github.com/Filecoin-project/filecoin-ffi?tab=readme-ov-file#building-from-source
RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/devnet/.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-09-20-e9b6503
LOTUS_IMAGE=ghcr.io/chainsafe/lotus-devnet:2024-10-07-6d79e1d
FOREST_DATA_DIR=/forest_data
LOTUS_DATA_DIR=/lotus_data
FIL_PROOFS_PARAMETER_CACHE=/var/tmp/filecoin-proof-parameters
Expand Down
4 changes: 2 additions & 2 deletions scripts/devnet/lotus.dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Lotus binaries image, to be used in the local devnet with Forest.
FROM golang:1.21-bookworm AS lotus-builder
FROM golang:1.22-bookworm AS lotus-builder
SHELL ["/bin/bash", "-o", "pipefail", "-c"]

RUN apt-get update && \
Expand All @@ -13,7 +13,7 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --profile mini

ENV PATH="/root/.cargo/bin:${PATH}"

RUN git clone --depth 1 --branch v1.29.1 https://github.com/filecoin-project/lotus.git .
RUN git clone --depth 1 --branch v1.29.2 https://github.com/filecoin-project/lotus.git .

# https://github.com/Filecoin-project/filecoin-ffi?tab=readme-ov-file#building-from-source
RUN CGO_CFLAGS_ALLOW="-D__BLST_PORTABLE__" \
Expand Down
Loading