Merge pull request #7 from Zapgram/hypopg

Include HypoPG in the Docker image
Zapgram · Nov 4, 2024 · 7f64d21 · 7f64d21
2 parents 0732bba + cfcce83
commit 7f64d21
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -4,6 +4,7 @@ name: Build and publish Docker image
 
 env:
   POSTGRES_VERSION: "15.7"
+  HYPOPG_VERSION: "1.4.0"
   PGVECTOR_VERSION: "0.6.0"
 
 on:
@@ -37,7 +38,8 @@ jobs:
           context: .
           build-args: |
             POSTGRES_VERSION=${{env.POSTGRES_VERSION}}
+            HYPOPG_VERSION=${{env.HYPOPG_VERSION}}
             PGVECTOR_VERSION=${{env.PGVECTOR_VERSION}}
           platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/zapgram/pilot-postgres:${{env.POSTGRES_VERSION}}-pgvector${{env.PGVECTOR_VERSION}}
+          tags: ghcr.io/zapgram/pilot-postgres:${{env.POSTGRES_VERSION}}-hypopg${{env.HYPOPG_VERSION}}-pgvector${{env.PGVECTOR_VERSION}}
           push: ${{ github.ref_name == 'trunk' }}
diff --git a/Dockerfile b/Dockerfile
@@ -5,6 +5,16 @@ FROM postgres:${POSTGRES_VERSION}-alpine
 RUN apk add --no-cache \
     git make gcc clang15 llvm15 musl-dev
 
+ARG HYPOPG_VERSION
+
+RUN cd /tmp \
+    && git clone --branch ${HYPOPG_VERSION} https://github.com/HypoPG/hypopg.git \
+    && cd hypopg \
+    && make \
+    && make install \
+    && cd /tmp \
+    && rm -rf /tmp/hypopg
+
 ARG PGVECTOR_VERSION
 
 RUN cd /tmp \