Fix Docker build workflow for Ubuntu 24.04

montanalow · montanalow · commit 31c68e4ed3bb · 2025-04-15T11:16:01.000-07:00
- Add postgresml-python job to workflow to build Python package first
- Update Docker build to install postgresml-python package separately
- Ensures Python 3.12 is properly used for Ubuntu 24.04
diff --git a/.github/workflows/ubuntu-packages-and-docker-image.yml b/.github/workflows/ubuntu-packages-and-docker-image.yml
@@ -6,10 +6,33 @@ on:
       packageVersion:
         default: "2.10.0"
 jobs:
+  #
+  # PostgresML Python package.
+  #
+  postgresml-python:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ["ubuntu-22.04", "buildjet-4vcpu-ubuntu-2204-arm"]
+        ubuntu_version: ["20.04", "22.04", "24.04"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build and release Python package
+      env:
+        AWS_ACCESS_KEY_ID: ${{ vars.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_DEFAULT_REGION: ${{ vars.AWS_DEFAULT_REGION }}
+      run: |
+        sudo apt update
+        sudo apt install -y python3-dev python3-pip python3-virtualenv
+        bash packages/postgresml-python/release.sh ${{ inputs.packageVersion }} ${{ matrix.ubuntu_version }}
+
   #
   # PostgresML extension.
   #
   postgresml-pgml:
+    needs: postgresml-python
     strategy:
       fail-fast: false # Let the other job finish
       matrix:
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -18,7 +18,9 @@ RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --dearmor | te
 
 ENV TZ=UTC
 ENV DEBIAN_FRONTEND=noninteractive
-RUN apt update -y && apt install git postgresml-17 postgresml-dashboard -y
+RUN apt update -y && \
+    apt install -y git postgresml-python && \
+    apt install -y postgresml-17 postgresml-dashboard
 RUN git clone --branch v0.8.0 https://github.com/pgvector/pgvector && \
 cd pgvector && \
 echo "trusted = true" >> vector.control && \
