fix: postgres example dockerfile

Author: blitss

.cargo/config.toml

@@ -1,6 +1,6 @@
 [target.'cfg(target_os="macos")']
 # Postgres symbols won't be available until runtime
-rustflags = ["-Clink-arg=-Wl,-undefined,dynamic_lookup", "-C target-feature=+aes,+sse2"]
+rustflags = ["-Clink-arg=-Wl,-undefined,dynamic_lookup"]
 
 [target.'cfg(target_arch = "x86_64")']
 rustflags = ["-C", "target-feature=+aes"]

.github/workflows/release.yaml

@@ -1,5 +1,8 @@
 name: Build and Publish TypeID Extension
 
+permissions:
+  contents: write
+
 on:
   push:
     tags:
@@ -12,13 +15,14 @@ env:
 jobs:
   build-and-publish:
     strategy:
+      fail-fast: false # We want all of them to run, even if one fails
       matrix:
-        pg_version: [11, 12, 13, 14, 15, 16]
+        pg_version: [12, 13, 14, 15, 16]
         os: [ubuntu-latest, macos-latest]
         arch: [amd64, arm64]
         exclude:
           - os: macos-latest
-            arch: arm64
+            arch: amd64
 
     runs-on: ${{ matrix.os }}
 
@@ -40,26 +44,46 @@ jobs:
         sudo apt-get update -y -qq --fix-missing
         sudo apt-get install -y postgresql-${{ matrix.pg_version }} postgresql-server-dev-${{ matrix.pg_version }}
 
+        sudo chmod a+rwx `/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config --pkglibdir` `/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config --sharedir`/extension /var/run/postgresql/
+
     - name: Install PostgreSQL (macOS)
       if: runner.os == 'macOS'
       run: |
         brew install postgresql@${{ matrix.pg_version }}
         echo "/usr/local/opt/postgresql@${{ matrix.pg_version }}/bin" >> $GITHUB_PATH
 
-    - name: Build Extension
+    - name: Install cargo-pgrx
       run: |
-        cargo pgrx init
-        cargo pgrx package --pg-config /usr/bin/pg_config-${{ matrix.pg_version }}
+        if [ "${{ runner.os }}" == "Linux" ]; then
+          PG_CONFIG_PATH="/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config"
+        else
+          PG_CONFIG_PATH="/opt/homebrew/opt/postgresql@${{ matrix.pg_version }}/bin/pg_config"
+        fi
+        PGRX_VERSION=$(cargo metadata --format-version 1 | jq -r '.packages[]|select(.name=="pgrx")|.version')
+        cargo install --locked --version=$PGRX_VERSION cargo-pgrx --debug --force
+        cargo pgrx init --pg${{ matrix.pg_version }} $PG_CONFIG_PATH
+
+    - name: Build
+      run: |
+        if [ "${{ runner.os }}" == "Linux" ]; then
+          PG_CONFIG_PATH="/usr/lib/postgresql/${{ matrix.pg_version }}/bin/pg_config"
+        else
+          PG_CONFIG_PATH="/opt/homebrew/opt/postgresql@${{ matrix.pg_version }}/bin/pg_config"
+        fi
+        cargo pgrx package --features pg${{ matrix.pg_version }} --pg-config $PG_CONFIG_PATH
+
+    - name: Set lowercase OS name
+      run: echo "LOWERCASE_OS=$(echo ${{ runner.os }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
 
     - name: Package Extension
       run: |
         mkdir -p release
-        tar -czvf release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }}-${{ runner.os }}-${{ matrix.arch }}.tar.gz -C target/release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }} .
+        tar -czvf release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }}-${{ env.LOWERCASE_OS }}-${{ matrix.arch }}.tar.gz -C target/release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }} .
 
     - name: Upload Release Asset
       uses: softprops/action-gh-release@v1
       with:
-        files: release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }}-${{ runner.os }}-${{ matrix.arch }}.tar.gz
+        files: release/${{ env.EXTENSION_NAME }}-pg${{ matrix.pg_version }}-${{ env.LOWERCASE_OS }}-${{ matrix.arch }}.tar.gz
 
   build-and-push-docker:
     needs: build-and-publish

Dockerfile

@@ -1,5 +1,7 @@
+ARG PG_VERSION=16
+
 # Stage 1: Build the extension
-FROM rust:latest as builder
+FROM rust:latest AS builder
 
 ARG PG_VERSION=16
 
@@ -17,18 +19,21 @@ WORKDIR /usr/src/typeid
 COPY . .
 
 RUN cargo install cargo-pgrx \
-    && cargo pgrx init \
-    && cargo pgrx package --pg-config /usr/bin/pg_config-${PG_VERSION}
+    && cargo pgrx init --pg${PG_VERSION} /usr/lib/postgresql/${PG_VERSION}/bin/pg_config \
+    && cargo pgrx package --pg-config /usr/lib/postgresql/${PG_VERSION}/bin/pg_config
+
+  RUN ls -R /usr/src/typeid/target/release/
 
 # Stage 2: Create the final Postgres image with the extension
 FROM postgres:${PG_VERSION}
 
 ARG PG_VERSION=16
 
 # Copy the built extension files from the builder stage
-COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/share/postgresql/${PG_VERSION}/extension/typeid.control /usr/share/postgresql/extension/
-COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/lib/postgresql/${PG_VERSION}/lib/typeid.so /usr/lib/postgresql/lib/
-COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/share/postgresql/${PG_VERSION}/extension/typeid--0.0.0.sql /usr/share/postgresql/extension/
+# Copy the built extension files
+COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/lib/postgresql/${PG_VERSION}/lib/typeid.so /usr/lib/postgresql/${PG_VERSION}/lib/
+COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/share/postgresql/${PG_VERSION}/extension/typeid.control /usr/share/postgresql/${PG_VERSION}/extension/
+COPY --from=builder /usr/src/typeid/target/release/typeid-pg${PG_VERSION}/usr/share/postgresql/${PG_VERSION}/extension/typeid--0.1.0.sql /usr/share/postgresql/${PG_VERSION}/extension/
 
 # Enable the extension
 RUN echo "shared_preload_libraries = 'typeid'" >> /usr/share/postgresql/postgresql.conf.sample

Readme.md

@@ -86,6 +86,6 @@ age |      Internal name       | Description
  public | typeid_lt        | boolean          | a typeid, b typeid  | func | volatile   | unsafe   | codespace | invoker  |                   | c        | typeid_lt_wrapper        | 
  public | typeid_ne        | boolean          | a typeid, b typeid  | func | volatile   | unsafe   | codespace | invoker  |                   | c        | typeid_ne_wrapper        | 
  public | typeid_out       | cstring          | input typeid        | func | immutable  | safe     | codespace | invoker  |                   | c        | typeid_out_wrapper       | 
- public | uuid_generate_v7 | uuid             |                     | func | volatile   | unsafe   | codespace | invoker  |                   | c        | uuid_generate_v7_wrapper | 
+ public | typeid_uuid_generate_v7 | uuid             |                     | func | volatile   | unsafe   | codespace | invoker  |                   | c        | uuid_generate_v7_wrapper | 
 (11 rows)
 ```

install.sh

@@ -2,6 +2,13 @@
 
 set -e
 
+# Check if a custom pg_config path is provided
+if [ $# -eq 1 ]; then
+    PG_CONFIG="$1"
+else
+    PG_CONFIG=$(which pg_config)
+fi
+
 # Function to get the latest release version
 get_latest_release() {
   curl --silent "https://api.github.com/repos/blitss/typeid-postgres/releases/latest" | 
@@ -23,10 +30,10 @@ else
 fi
 
 # Get PostgreSQL version
-PG_VERSION=$(psql -V | sed -n 's/^psql (PostgreSQL) \([0-9]\+\).*$/\1/p')
+PG_VERSION=$("$PG_CONFIG" --version | awk '{print $2}' | cut -d. -f1)
 
 if [ -z "$PG_VERSION" ]; then
-  echo "PostgreSQL not found. Please install PostgreSQL and make sure 'psql' is in your PATH."
+  echo "PostgreSQL not found. Please install PostgreSQL and make sure 'pg_config' is in your PATH or provide the path to pg_config as an argument."
   exit 1
 fi
 
@@ -40,11 +47,10 @@ DOWNLOAD_URL="https://github.com/blitss/typeid-postgres/releases/download/${RELE
 TMP_DIR=$(mktemp -d)
 
 # Download and extract
-echo "Downloading TypeID extension..."
+echo "Downloading TypeID extension from $DOWNLOAD_URL"
 curl -L "$DOWNLOAD_URL" | tar xz -C "$TMP_DIR"
 
 # Get PostgreSQL directories
-PG_CONFIG=$(which pg_config)
 EXTENSION_DIR=$("$PG_CONFIG" --sharedir)/extension
 LIB_DIR=$("$PG_CONFIG" --pkglibdir)
 

src/lib.rs

@@ -144,7 +144,7 @@ r#"
 
 /// Generate a UUID v7, producing a Postgres uuid object
 #[pg_extern]
-fn uuid_generate_v7() -> pgrx::Uuid {
+fn typeid_uuid_generate_v7() -> pgrx::Uuid {
     pgrx::Uuid::from_bytes(*Uuid::now_v7().as_bytes())
 }
 
@@ -163,7 +163,7 @@ mod tests {
 
     #[pg_test]
     fn test_uuid() {
-        let uuid: pgrx::Uuid = crate::uuid_generate_v7();
+        let uuid: pgrx::Uuid = crate::typeid_uuid_generate_v7();
         let converted: Uuid = Uuid::from_slice(uuid.as_bytes()).unwrap();
 
         println!("UUID: {:?}", uuid.to_string());