From f5866d2af8e507424126eb801735b2886c6d3068 Mon Sep 17 00:00:00 2001 From: Robert Yawn Date: Fri, 4 Jul 2025 12:17:05 +0200 Subject: [PATCH 1/2] chore: bump flatbuffers to current master SHA --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f0abcf..1b4fd5c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM alpine:3.16.0 as build +FROM alpine:3.22.0 as build RUN apk --no-cache add alpine-sdk bash clang cmake git # For the time being lock the commit version until the new release. -ARG FLATBUFFERS_VERSION=b4647b +ARG FLATBUFFERS_VERSION=6fe8afb3b6179ff16d314e12b54b333a22ebe00a ARG FLATCC_VERSION=v0.6.1 RUN git clone https://github.com/google/flatbuffers && \ @@ -19,7 +19,7 @@ RUN git clone --branch $FLATCC_VERSION https://github.com/dvidelabs/flatcc.git & scripts/initbuild.sh make && \ scripts/build.sh -FROM alpine:3.16.0 +FROM alpine:3.22.0 # Required dependency for the binaries. RUN apk --no-cache add libstdc++ From 4aa5c3f8d92179195d7d5c4fd4afda01251b8ba7 Mon Sep 17 00:00:00 2001 From: Robert Yawn Date: Fri, 4 Jul 2025 12:22:31 +0200 Subject: [PATCH 2/2] chore: bump to flatbuffers v25.2.10 --- Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b4fd5c..aef53e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,19 +2,17 @@ FROM alpine:3.22.0 as build RUN apk --no-cache add alpine-sdk bash clang cmake git -# For the time being lock the commit version until the new release. -ARG FLATBUFFERS_VERSION=6fe8afb3b6179ff16d314e12b54b333a22ebe00a +ARG FLATBUFFERS_VERSION=v25.2.10 ARG FLATCC_VERSION=v0.6.1 -RUN git clone https://github.com/google/flatbuffers && \ +RUN git clone --depth 1 --branch $FLATBUFFERS_VERSION https://github.com/google/flatbuffers && \ cd /flatbuffers && \ - git reset --hard $FLATBUFFERS_VERSION && \ CC=/usr/bin/clang \ CXX=/usr/bin/clang++ \ cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && \ make -RUN git clone --branch $FLATCC_VERSION https://github.com/dvidelabs/flatcc.git && \ +RUN git clone --depth 1 --branch $FLATCC_VERSION https://github.com/dvidelabs/flatcc.git && \ cd /flatcc && \ scripts/initbuild.sh make && \ scripts/build.sh