From e463d7b8e20ab69a0553eea266d7d8bb3f18354a Mon Sep 17 00:00:00 2001 From: "Carol (Nichols || Goulding)" Date: Wed, 17 Mar 2021 16:11:22 -0400 Subject: [PATCH] fix: Update flatc used in the CI Docker image --- docker/Dockerfile.ci | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.ci b/docker/Dockerfile.ci index f4f7cea9b7..97987336a2 100644 --- a/docker/Dockerfile.ci +++ b/docker/Dockerfile.ci @@ -10,15 +10,16 @@ ## # Build any binaries that can be copied into the CI image -# Note we build flatbuffers from source (pinned to a particualar version) +# Note we build flatbuffers from source (pinned to a particualar SHA) FROM rust:slim-buster AS flatc -ARG flatbuffers_version="v1.12.0" +ARG flatbuffers_version="86401e00" RUN apt-get update \ && mkdir -p /usr/share/man/man1 \ && apt-get install -y \ git make clang cmake llvm \ --no-install-recommends \ - && git clone -b ${flatbuffers_version} -- https://github.com/google/flatbuffers.git /usr/local/src/flatbuffers \ + && git clone -b master -- https://github.com/google/flatbuffers.git /usr/local/src/flatbuffers \ + && git -C /usr/local/src/flatbuffers reset --hard ${flatbuffers_version} \ && cmake -S /usr/local/src/flatbuffers -B /usr/local/src/flatbuffers \ -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=Release \