Skip to content

chore(dev): Fix package install in Tiltfile #18198

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.

Sign up for GitHub

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

Merged
jszwedko merged 5 commits into from
Aug 11, 2023
Merged

chore(dev): Fix package install in Tiltfile #18198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
29a5ee9
chore(dev): Fix package install in Tiltfile
jszwedko Aug 9, 2023
bd902eb
Merge remote-tracking branch 'origin/master' into jszwedko/fix-tiltfi…
jszwedko Aug 10, 2023
0aac5f8
Update mold
jszwedko Aug 10, 2023
bbe8525
Actually update mold
jszwedko Aug 10, 2023
bc2d1dd
Spelling
jszwedko Aug 10, 2023
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
4 changes: 3 additions & 1 deletion .github/actions/spelling/excludes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,13 @@
\.zst$
^\.github/actions/spelling/
^\Q.cargo/config.toml\E$
^\Q.github/workflows/spelling.yml\E$
^\Q.github/workflows/gardener_issue_comment.yml\E$
^\Q.github/workflows/spelling.yml\E$
^\Qbenches/codecs/moby_dick.txt\E$
^\Qbenches/dnstap/mod.rs\E$
^\Qbenches/transform/route.rs\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf.desc\E$
^\Qlib/codecs/tests/data/decoding/protobuf/test_protobuf3.desc\E$
^\Qlib/dnsmsg-parser/benches/benches.rs\E$
^\Qlib/dnsmsg-parser/src/dns_message_parser.rs\E$
^\Qlib/lookup/tests/fixtures/lookup/quoted\E$
Expand Down
1 change: 1 addition & 0 deletions .github/actions/spelling/expect.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ datname
dbkind
dbreader
DBserver
DCMAKE
ddagent
ddev
ddmetric
Expand Down
12 changes: 10 additions & 2 deletions tilt/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ ARG FEATURES=api,api-client,sources-datadog_agent,sources-fluent,sources-host_me
# VECTOR BUILDER
#
FROM docker.io/rust:${RUST_VERSION}-${DEBIAN_RELEASE} as builder
RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-10-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g
RUN git clone https://github.com/rui314/mold.git && cd mold && git checkout v1.2.1 && make -j"$(nproc)" && make install
RUN apt-get update && apt-get -y --no-install-recommends install build-essential git clang cmake libclang-dev libsasl2-dev libstdc++-11-dev libssl-dev libxxhash-dev zlib1g-dev zlib1g
Copy link
Collaborator Author

@jszwedko jszwedko Aug 10, 2023

Choose a reason for hiding this comment

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

libstdc++ needed to be bumped as part of updating to bookworm

RUN git clone https://github.com/rui314/mold.git \
&& mkdir mold/build \
&& cd mold/build \
&& git checkout v2.0.0 \
&& ../install-build-deps.sh \
&& cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=c++ .. \
&& cmake --build . -j $(nproc) \
&& cmake --install .

WORKDIR /vector
COPY . .
ARG FEATURES
RUN scripts/environment/install-protoc.sh
Copy link
Collaborator Author

@jszwedko jszwedko Aug 10, 2023

Choose a reason for hiding this comment

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

I think this was just missed before.

RUN --mount=type=cache,target=/vector/target \
--mount=type=cache,target=/usr/local/cargo/registry \
--mount=type=cache,target=/usr/local/cargo/git \
Expand Down