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

* chore(dev): Fix package install in Tiltfile Missed during the upgrade to Debian Bookworm Signed-off-by: Jesse Szwedko <[email protected]> * Update mold Signed-off-by: Jesse <[email protected]> * Actually update mold Signed-off-by: Jesse <[email protected]> * Spelling Signed-off-by: Jesse Szwedko <[email protected]> --------- Signed-off-by: Jesse Szwedko <[email protected]> Signed-off-by: Jesse <[email protected]>
aholmberg · Aug 10, 2023 · f39a0e9 · f39a0e9
1 parent 1dd7bb1
commit f39a0e9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/.github/actions/spelling/excludes.txt b/.github/actions/spelling/excludes.txt
@@ -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$

diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -231,6 +231,7 @@ datname
 dbkind
 dbreader
 DBserver
+DCMAKE
 ddagent
 ddev
 ddmetric

diff --git a/tilt/Dockerfile b/tilt/Dockerfile
@@ -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
+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
 RUN --mount=type=cache,target=/vector/target \
     --mount=type=cache,target=/usr/local/cargo/registry \
     --mount=type=cache,target=/usr/local/cargo/git \
-Original file line number
+Diff line change
@@ Expand Up / @@ -231,6 +231,7 @@ datname @@
     dbkind
     dbreader
     DBserver
+    DCMAKE
     ddagent
     ddev
     ddmetric
@@ Expand Down @@