diff --git a/Dockerfile b/Dockerfile index 6759c4645..4539fd4ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -648,13 +648,25 @@ ADD --checksum=${groonga_release_checksum} \ /tmp/groonga.tar.gz RUN tar -xvf /tmp/groonga.tar.gz -C /tmp && \ rm -rf /tmp/groonga.tar.gz +# Install build dependencies +RUN apt-get update && apt-get install -y --no-install-recommends \ + zlib1g-dev \ + liblz4-dev \ + libzstd-dev \ + libmsgpack-dev \ + libzmq3-dev \ + libevent-dev \ + libmecab-dev \ + rapidjson-dev \ + pkg-config \ + && rm -rf /var/lib/apt/lists/* # Build from source WORKDIR /tmp/groonga-${groonga_release} RUN ./configure RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \ make -j$(nproc) # Create debian package -RUN checkinstall -D --install=yes --fstrans=no --backup=no --pakdir=/tmp --nodoc +RUN checkinstall -D --install=yes --fstrans=no --backup=no --pakdir=/tmp --requires=zlib1g,liblz4-1,libzstd1,libmsgpackc2,libzmq5,libevent-2.1-7,libmecab2 --nodoc FROM groonga as pgroonga-source # Download and extract @@ -665,16 +677,12 @@ ADD --checksum=${pgroonga_release_checksum} \ /tmp/pgroonga.tar.gz RUN tar -xvf /tmp/pgroonga.tar.gz -C /tmp && \ rm -rf /tmp/pgroonga.tar.gz -# Install build dependencies -RUN apt-get update && apt-get install -y --no-install-recommends \ - pkg-config \ - && rm -rf /var/lib/apt/lists/* # Build from source WORKDIR /tmp/pgroonga-${pgroonga_release} RUN --mount=type=cache,target=/ccache,from=public.ecr.aws/supabase/postgres:ccache \ make -j$(nproc) # Create debian package -RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc +RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --requires=mecab-naist-jdic --nodoc FROM scratch as pgroonga-deb COPY --from=pgroonga-source /tmp/*.deb /tmp/ diff --git a/common.vars.pkr.hcl b/common.vars.pkr.hcl index 64063de38..22b8ce36b 100644 --- a/common.vars.pkr.hcl +++ b/common.vars.pkr.hcl @@ -1 +1 @@ -postgres-version = "15.1.0.89" +postgres-version = "15.1.0.90"