fix: make build work

Author: naorpeled

.github/workflows/publish.yml

@@ -2,65 +2,63 @@ name: Publish Docker image
 
 on:
   push:
-    tags: ["v*.*.*"]
-  workflow_dispatch:
+    tags: ["v*.*.*"] # Trigger on version tags like v1.0.0
+  workflow_dispatch: # Allows manual triggering
 
 env:
   REGISTRY: ghcr.io
+  # IMAGE_NAME is constructed as owner/repository_name by default in metadata-action
+  # Example: ghcr.io/yourusername/yourrepositoryname
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: write
+      packages: write # Required to publish to GHCR
 
     strategy:
       matrix:
         include:
-          # Latest PostgreSQL with latest pgvector
-          - pg_version: 16
-            pgvector_version: v0.8.0
-            latest: true
-          # Previous PostgreSQL with latest pgvector
-          - pg_version: 15
-            pgvector_version: v0.8.0
-            latest: false
-          # Latest PostgreSQL with previous pgvector
-          - pg_version: 16
-            pgvector_version: v0.7.2
-            latest: false
-          # Previous PostgreSQL with previous pgvector
-          - pg_version: 15
-            pgvector_version: v0.7.2
-            latest: false
+          - pg_major_version: 16
+            postgis_major_version: 3
+            pgvector_tag: v0.8.0
+            latest_tag_suffix: true # This combination will also be tagged 'latest'
+          - pg_major_version: 15
+            postgis_major_version: 3
+            pgvector_tag: v0.8.0
+            latest_tag_suffix: false
+          - pg_major_version: 16
+            postgis_major_version: 3
+            pgvector_tag: v0.7.2
+            latest_tag_suffix: false
+          - pg_major_version: 15
+            postgis_major_version: 3
+            pgvector_tag: v0.7.2
+            latest_tag_suffix: false
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Log in to the Container registry
+      - name: Log in to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ github.event.repository.name }}
           tags: |
-            type=raw,value=pg${{ matrix.pg_version }}-pgvector${{ matrix.pgvector_version }}
-            type=raw,value=latest,enable=${{ matrix.latest }}
-          labels: |
-            org.opencontainers.image.title=PostgreSQL with PostGIS and pgvector
-            org.opencontainers.image.description=PostgreSQL ${{ matrix.pg_version }} with PostGIS 3 and pgvector ${{ matrix.pgvector_version }}
-            org.opencontainers.image.source=${{ github.server_url }}/${{ github.repository }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+            type=raw,value=pg${{ matrix.pg_major_version }}-postgis${{ matrix.postgis_major_version }}-pgvector${{ matrix.pgvector_tag }}\n{{#if matrix.latest_tag_suffix}}latest{{/if}}
+            type=ref,event=tag # Add tag from git tag if event is a tag push (e.g., v1.0.0)
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
@@ -70,8 +68,8 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            PG_MAJOR=${{ matrix.pg_version }}
-            POSTGIS_MAJOR_VERSION=3
-            PGVECTOR_VERSION=${{ matrix.pgvector_version }}
+            PG_MAJOR_VERSION=${{ matrix.pg_major_version }}
+            POSTGIS_MAJOR_VERSION=${{ matrix.postgis_major_version }}
+            PGVECTOR_TAG=${{ matrix.pgvector_tag }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.github/workflows/test.yml

@@ -12,8 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        pg_version: [16, 15]
-        pgvector_version: [v0.8.0, v0.7.2]
+        # Renaming for clarity in matrix, maps to Dockerfile ARGs
+        pg_version_matrix: [16, 15] # Corresponds to PG_MAJOR_VERSION
+        pgvector_tag_matrix: [v0.8.0, v0.7.2] # Corresponds to PGVECTOR_TAG
+        # POSTGIS_MAJOR_VERSION is set to 3 directly in build-args below
 
     steps:
       - uses: actions/checkout@v4
@@ -22,61 +24,46 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build Docker image
+        id: build
         uses: docker/build-push-action@v5
         with:
           context: .
-          load: true
-          tags: postgres-postgis-pgvector:test
+          load: true # Load image into local Docker daemon for testing
+          tags: postgres-postgis-pgvector:test-${{ matrix.pg_version_matrix }}-pgvector${{ matrix.pgvector_tag_matrix }}
           build-args: |
-            PG_MAJOR=${{ matrix.pg_version }}
+            PG_MAJOR_VERSION=${{ matrix.pg_version_matrix }}
             POSTGIS_MAJOR_VERSION=3
-            PGVECTOR_VERSION=${{ matrix.pgvector_version }}
+            PGVECTOR_TAG=${{ matrix.pgvector_tag_matrix }}
 
-      - name: Start PostgreSQL container
+      - name: Start PostgreSQL container and test extensions
         run: |
-          docker run -d \
-            --name postgres-test \
+          IMAGE_TAG="postgres-postgis-pgvector:test-${{ matrix.pg_version_matrix }}-pgvector${{ matrix.pgvector_tag_matrix }}"
+          echo "Testing image: $IMAGE_TAG"
+
+          docker run -d --name test-db \
             -e POSTGRES_PASSWORD=test \
             -e POSTGRES_USER=test \
             -e POSTGRES_DB=test \
-            -e ADDITIONAL_DATABASES=test2 \
-            -p 5432:5432 \
-            postgres-postgis-pgvector:test
+            $IMAGE_TAG \
+            postgres -c shared_preload_libraries=vector # Ensure pgvector is preloaded
 
-      - name: Wait for PostgreSQL to be ready
-        run: |
-          timeout 30 bash -c 'until docker exec postgres-test pg_isready -U test; do sleep 1; done'
+          echo "Waiting for PostgreSQL to start..."
+          sleep 15 # Allow time for PostgreSQL to initialize
 
-      - name: Test PostGIS extension
-        run: |
-          docker exec postgres-test psql -U test -d test -c "
-            SELECT postgis_version();
-            SELECT postgis_full_version();
-          "
+          echo "PostgreSQL logs:"
+          docker logs test-db
 
-      - name: Test pgvector extension
-        run: |
-          docker exec postgres-test psql -U test -d test -c "
-            CREATE EXTENSION IF NOT EXISTS vector;
-            -- Create a test table with a vector column
-            CREATE TABLE items (id bigserial PRIMARY KEY, embedding vector(3));
-            -- Insert a test vector
-            INSERT INTO items (embedding) VALUES ('[1,2,3]');
-            -- Test vector operations
-            SELECT * FROM items WHERE embedding <-> '[3,2,1]' < 5;
-          "
+          echo "Checking PostGIS version..."
+          docker exec test-db psql -U test -d test -c "SELECT postgis_full_version();"
 
-      - name: Test additional database
-        run: |
-          docker exec postgres-test psql -U test -d test2 -c "
-            SELECT postgis_version();
-            SELECT * FROM pg_extension WHERE extname = 'vector';
-          "
+          echo "Checking pgvector extension version..."
+          docker exec test-db psql -U test -d test -c "CREATE EXTENSION IF NOT EXISTS vector; SELECT extversion FROM pg_extension WHERE extname = 'vector';"
 
-      - name: Check logs for any errors
-        if: always()
-        run: docker logs postgres-test
+          echo "Attempting to create a table with a vector column and insert data..."
+          docker exec test-db psql -U test -d test -c "CREATE TABLE items (id bigserial PRIMARY KEY, embedding vector(3)); INSERT INTO items (embedding) VALUES ('[1,2,3]'), ('[4,5,6]'); SELECT COUNT(*) FROM items;"
 
-      - name: Clean up
-        if: always()
-        run: docker rm -f postgres-test
+      - name: Stop and remove container
+        if: always() # Ensure cleanup even if previous steps fail
+        run: |
+          docker stop test-db || true
+          docker rm test-db || true

Dockerfile

@@ -1,57 +1,75 @@
 # Default versions - can be overridden at build time using --build-arg
-ARG PG_MAJOR=16
+ARG PG_MAJOR_VERSION=16
 ARG POSTGIS_MAJOR_VERSION=3
-ARG PGVECTOR_VERSION=v0.7.2
+ARG PGVECTOR_TAG=v0.8.0
 
-FROM postgres:${PG_MAJOR}
+FROM postgres:${PG_MAJOR_VERSION}
+
+# Re-declare ARGs after FROM to make them available in this build stage
+ARG PG_MAJOR_VERSION
+ARG POSTGIS_MAJOR_VERSION
+ARG PGVECTOR_TAG
 
 LABEL maintainer="Naor Peled me@naor.dev"
-LABEL description="PostgreSQL with PostGIS and pgvector extensions"
-LABEL org.opencontainers.image.source="https://github.com/naorpeled/postgis_pgvector"
+LABEL description="PostgreSQL with PostGIS and pgvector extensions for TypeORM"
+LABEL org.opencontainers.image.source="https://github.com/naorpeled/typeorm-postgres-docker"
 
-# Set ENV vars from ARGs for use in subsequent RUN commands and runtime inspection
-ENV POSTGIS_MAJOR_VERSION=${POSTGIS_MAJOR_VERSION} \
-    PGVECTOR_VERSION=${PGVECTOR_VERSION} \
-    PG_MAJOR=${PG_MAJOR}
+# Set ENV vars from ARGs for runtime inspection and use within the container
+ENV PG_MAJOR_VERSION=${PG_MAJOR_VERSION} \
+    POSTGIS_MAJOR_VERSION=${POSTGIS_MAJOR_VERSION} \
+    PGVECTOR_TAG=${PGVECTOR_TAG}
 
-# Install build dependencies and PostgreSQL development packages
+# Install base dependencies, setup PGDG repository, and install build tools
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
-    # Tools for adding repositories
     lsb-release \
     gnupg \
     ca-certificates \
     wget \
-    # Build tools for pgvector
+    # Add PostgreSQL official repository
+    && sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
+    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+    # Update package lists again after adding the new repository
+    && apt-get update \
+    # Install build tools and PostgreSQL development packages from PGDG
+    && apt-get install -y --no-install-recommends \
     build-essential \
     git \
     make \
     gcc \
-    postgresql-server-dev-${PG_MAJOR} \
-    # Add PostgreSQL repository for latest PostGIS
-    && wget --quiet -O /usr/share/keyrings/postgresql-archive-keyring.asc https://www.postgresql.org/media/keys/ACCC4CF8.asc \
-    && echo "deb [signed-by=/usr/share/keyrings/postgresql-archive-keyring.asc] http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main ${PG_MAJOR}" > /etc/apt/sources.list.d/pgdg.list \
-    && apt-get update \
-    # Install PostGIS
+    "postgresql-server-dev-${PG_MAJOR_VERSION}"
+
+# Install PostGIS
+RUN apt-get update \
     && apt-get install -y --no-install-recommends \
     postgis \
-    postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR_VERSION} \
-    postgresql-${PG_MAJOR}-postgis-${POSTGIS_MAJOR_VERSION}-scripts \
-    # Build and install pgvector
+    "postgresql-${PG_MAJOR_VERSION}-postgis-${POSTGIS_MAJOR_VERSION}" \
+    "postgresql-${PG_MAJOR_VERSION}-postgis-${POSTGIS_MAJOR_VERSION}-scripts"
+
+# Build and install pgvector
+RUN apt-get update \
+    # Ensure build tools are available for this layer if they were aggressively purged before,
+    # or if previous RUN commands didn't include them and they are needed.
+    # For pgvector, we need git, make, gcc, and postgresql-server-dev.
+    && apt-get install -y --no-install-recommends git make gcc "postgresql-server-dev-${PG_MAJOR_VERSION}" \
     && mkdir -p /usr/src/pgvector \
-    && git clone --branch ${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git /usr/src/pgvector \
+    && git clone --branch "${PGVECTOR_TAG}" https://github.com/pgvector/pgvector.git /usr/src/pgvector \
     && cd /usr/src/pgvector \
     && make \
-    && make install \
-    # Cleanup
-    && apt-get purge -y --auto-remove \
-    wget \
-    gnupg \
+    && make install
+
+# Cleanup build dependencies
+RUN apt-get purge -y --auto-remove \
     build-essential \
+    # git make gcc "postgresql-server-dev-${PG_MAJOR_VERSION}" were re-installed for pgvector, purge them too
     git \
     make \
     gcc \
-    postgresql-server-dev-${PG_MAJOR} \
+    "postgresql-server-dev-${PG_MAJOR_VERSION}" \
+    wget \
+    # gnupg might be needed if other repositories are added later, but for now, we can remove it
+    # if it was only for the postgresql repo key. lsb-release and ca-certificates are generally kept.
+    && apt-get clean \
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /usr/src/pgvector