force buildkite to build the sdk using the new repo (#13)

* buildkite uses the new repo to build the sdk

* update pglite-builder image used for wasm

* remove unused Dockerfile

---------

Co-authored-by: tudor <tudor@swisstch.com>

Author: tdrz

.buildkite/builder-docker-image.yml

@@ -27,4 +27,4 @@ steps:
         --build-arg SDK_VERSION=$${SDK_VERSION}
         -t $${IMGNAME}:$${IMGTAG}
         -t $${IMGNAME}:latest
-        .
+        ./pglite

pglite/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:22.04 AS build_sdk
 
-ARG PG_VERSION
-ARG SDK_VERSION
+ARG PG_VERSION=16.4
+ARG SDK_VERSION=3.1.74.3bi
 ARG DEBUG=false
 ARG OBJDUMP=true
 
@@ -12,7 +12,7 @@ ENV \
   SYS_PYTHON=/usr/bin/python3 \
   DEBUG=$DEBUG \
   BUILDS=3.12 \
-  EMFLAVOUR=latest
+  EMFLAVOUR=3.1.74
 
 WORKDIR /workspace
 
@@ -26,53 +26,43 @@ RUN \
   make build-essential wget lz4 bzip2 pv curl
 
 # Download the python-wasm-sdk source for the given version
-RUN git clone --depth 1 --branch ${SDK_VERSION} https://github.com/pygame-web/python-wasm-sdk.git
+# RUN git clone --depth 1 --branch ${SDK_VERSION} https://github.com/pygame-web/python-wasm-sdk.git
+RUN git clone --depth 1 https://github.com/electric-sql/portable-sdk.git
 
-# Remove third party libraries that are not necessary for PGLite
-RUN cd ./python-wasm-sdk/sources.wasm && rm assimp.sh bullet3.sh ode.sh
+WORKDIR /workspace/portable-sdk/python-wasm-sdk
 
 # Make python-wasm-sdk
-RUN cd ./python-wasm-sdk && chmod +x ./python-wasm-sdk.sh && bash -c "./python-wasm-sdk.sh"
+RUN chmod +x python-wasm-sdk.sh 
 
+RUN bash -c "./python-wasm-sdk.sh"
 
 FROM ubuntu:22.04
 
-ARG PG_VERSION
-ARG SDK_VERSION
+# Install dependencies to build postgres wasm
+RUN \
+  apt-get update &&\
+  apt-get install -y lz4 wget pv bash bzip2 python3 build-essential libreadline-dev zlib1g-dev bison flex &&\
+  apt-get clean
+
+ARG PG_VERSION=16.4
+ARG SDK_VERSION=3.1.74.3bi
 ARG DEBUG=false
 ARG OBJDUMP=true
 
 ENV \
   PG_VERSION=$PG_VERSION \
   SDK_VERSION=$SDK_VERSION \
-  SDK_ARCHIVE=python3.12-wasm-sdk-Ubuntu-22.04.tar \
+  SDK_ARCHIVE=python3.12-wasm-sdk-Ubuntu-22.04.tar.lz4 \
   SDKROOT=/opt/python-wasm-sdk \
   SYS_PYTHON=/usr/bin/python3 \
   PGROOT=/tmp/pglite \
   DEBUG=$DEBUG \
   OBJDUMP=$OBJDUMP
 
-WORKDIR /workspace
-
-COPY --from=0 /tmp/sdk /tmp/sdk
-
-ENV SDK_VERSION=3.1.74.2bi
-ENV WASI_SDK_VERSION=24.0.5
-ENV SDK_ARCHIVE=python3.13-wasm-sdk-Ubuntu-22.04.tar.lz4
-ENV WASI_SDK_ARCHIVE=python3.13-wasi-sdk-Ubuntu-22.04.tar.lz4
-
-# Install dependencies to build postgres wasm
-RUN \
-  apt-get update &&\
-  apt-get install -y lz4 wget pv bash curl bzip2 python3 build-essential libreadline-dev zlib1g-dev bison flex git curl &&\
-  apt-get clean
-
-RUN curl -sL --retry 5 https://github.com/pygame-web/python-wasm-sdk/releases/download/$SDK_VERSION/$SDK_ARCHIVE | tar xvP --use-compress-program=lz4 | pv -p -l -s 46000 >/dev/null
-RUN curl -sL --retry 5 https://github.com/pygame-web/python-wasi-sdk/releases/download/$WASI_SDK_VERSION/$WASI_SDK_ARCHIVE | tar xvP --use-compress-program=lz4 | pv -p -l -s 23000 >/dev/null
+COPY --from=build_sdk /tmp/sdk /tmp/sdk
 
-# Extract SDK
-RUN cd / && tar xvf /tmp/sdk/${SDK_ARCHIVE} | pv -p -l -s 24400 >/dev/null
+RUN tar --use-compress-program=lz4 -xvf /tmp/sdk/${SDK_ARCHIVE} -C /
 
-# Clean up packaged SDK
-RUN rm -rf /tmp/sdk
+RUN rm -r /tmp/sdk
 
+WORKDIR /workspace

pglite/cibuild/build-with-docker.sh

@@ -12,7 +12,7 @@ if [[ -z "$SDK_VERSION" || -z "$PG_VERSION" ]]; then
   exit 1
 fi
 
-IMG_NAME="electricsql/emsdk"
+IMG_NAME="electricsql/pglite-builder"
 IMG_TAG="${PG_VERSION}_${SDK_VERSION}"
 
 SDK_ARCHIVE="${SDK_ARCHIVE:-python3.13-wasm-sdk-Ubuntu-22.04.tar.lz4}"