Merge pull request #6 from blitss/staging

fix: dockerfile build for postgres (use prebuilt binaries)

Author: blitss

Dockerfile

@@ -1,39 +1,10 @@
 ARG PG_VERSION=16
-
-# Stage 1: Build the extension
-FROM rust:latest AS builder
-
-ARG PG_VERSION=16
-
-RUN apt-get update && apt-get install -y \
-    wget \
-    gnupg \
-    lsb-release \
-    && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-    && echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list \
-    && apt-get update \
-    && apt-get install -y postgresql-${PG_VERSION} postgresql-server-dev-${PG_VERSION}
-
-WORKDIR /usr/src/typeid
-
-COPY . .
-
-RUN cargo install cargo-pgrx \
-    && 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 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/
+RUN apt update && apt install -y curl
+RUN curl -sSL https://raw.githubusercontent.com/blitss/typeid-postgres/main/install.sh | bash
 
 # Enable the extension
 RUN echo "shared_preload_libraries = 'typeid'" >> /usr/share/postgresql/postgresql.conf.sample

install.sh

@@ -56,9 +56,9 @@ LIB_DIR=$("$PG_CONFIG" --pkglibdir)
 
 # Install files
 echo "Installing TypeID extension..."
-sudo cp "$TMP_DIR"/usr/share/postgresql/*/extension/typeid.control "$EXTENSION_DIR"
-sudo cp "$TMP_DIR"/usr/share/postgresql/*/extension/typeid--*.sql "$EXTENSION_DIR"
-sudo cp "$TMP_DIR"/usr/lib/postgresql/*/lib/typeid.so "$LIB_DIR"
+cp "$TMP_DIR"/usr/share/postgresql/*/extension/typeid.control "$EXTENSION_DIR"
+cp "$TMP_DIR"/usr/share/postgresql/*/extension/typeid--*.sql "$EXTENSION_DIR"
+cp "$TMP_DIR"/usr/lib/postgresql/*/lib/typeid.so "$LIB_DIR"
 
 # Clean up
 rm -rf "$TMP_DIR"