From 4e1dab1d46279405f4f984eab135aac5fa9d89e8 Mon Sep 17 00:00:00 2001
From: Qiao Han <qiao@supabase.io>
Date: Mon, 5 Jun 2023 19:59:48 +0800
Subject: [PATCH 1/3] fix: update build and runtime dependencies for groonga

---
 Dockerfile | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6759c4645..d72a87a87 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -648,6 +648,19 @@ 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 \
+    libz-dev \
+    libzstd-dev \
+    libmsgpack-dev \
+    libzmq3-dev \
+    libevent-dev \
+    libmecab-dev \
+    mecab-naist-jdic \
+    pkg-config \
+    && rm -rf /var/lib/apt/lists/*
 # Build from source
 WORKDIR /tmp/groonga-${groonga_release}
 RUN ./configure
@@ -665,16 +678,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=libmsgpackc2 --nodoc
 
 FROM scratch as pgroonga-deb
 COPY --from=pgroonga-source /tmp/*.deb /tmp/

From ba628397f18c1d616392c456ba130c7f1e707c8b Mon Sep 17 00:00:00 2001
From: Qiao Han <qiao@supabase.io>
Date: Mon, 5 Jun 2023 21:07:26 +0800
Subject: [PATCH 2/3] chore: add rapidjson and tokenizer dependencies

---
 Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d72a87a87..3b594ccf9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -652,13 +652,12 @@ RUN tar -xvf /tmp/groonga.tar.gz -C /tmp && \
 RUN apt-get update && apt-get install -y --no-install-recommends \
     zlib1g-dev \
     liblz4-dev \
-    libz-dev \
     libzstd-dev \
     libmsgpack-dev \
     libzmq3-dev \
     libevent-dev \
     libmecab-dev \
-    mecab-naist-jdic \
+    rapidjson-dev \
     pkg-config \
     && rm -rf /var/lib/apt/lists/*
 # Build from source
@@ -667,7 +666,7 @@ 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
@@ -683,7 +682,7 @@ 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 --requires=libmsgpackc2 --nodoc
+RUN checkinstall -D --install=no --fstrans=no --backup=no --pakdir=/tmp --nodoc
 
 FROM scratch as pgroonga-deb
 COPY --from=pgroonga-source /tmp/*.deb /tmp/

From 73b424c702273d4ac02b5ce8def84f125b2a75cd Mon Sep 17 00:00:00 2001
From: Qiao Han <qiao@supabase.io>
Date: Mon, 5 Jun 2023 22:36:47 +0800
Subject: [PATCH 3/3] chore: bump release version

---
 Dockerfile          | 2 +-
 common.vars.pkr.hcl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3b594ccf9..4539fd4ca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -682,7 +682,7 @@ 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"