From 1817992e391feda936956de999536930bbb50c15 Mon Sep 17 00:00:00 2001 From: tudor Date: Tue, 11 Mar 2025 15:03:13 +0100 Subject: [PATCH 1/3] updated sdk version to 3.1.61.6bi --- pglite/.buildconfig | 2 +- pglite/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pglite/.buildconfig b/pglite/.buildconfig index 7c5ca9b9badbc..5e55d25a75af8 100644 --- a/pglite/.buildconfig +++ b/pglite/.buildconfig @@ -1,4 +1,4 @@ PG_VERSION=16.4 -SDK_VERSION=3.1.74.3bi +SDK_VERSION=3.1.61.6bi WASI_SDK_VERSION=24.0.4 SDKROOT=/opt/python-wasm-sdk diff --git a/pglite/Dockerfile b/pglite/Dockerfile index 5b2f73fe2c2b8..49631040e8b79 100644 --- a/pglite/Dockerfile +++ b/pglite/Dockerfile @@ -1,7 +1,7 @@ FROM ubuntu:22.04 AS build_sdk ARG PG_VERSION=16.4 -ARG SDK_VERSION=3.1.74.3bi +ARG SDK_VERSION=3.1.61.6bi ARG DEBUG=false ARG OBJDUMP=true @@ -45,7 +45,7 @@ RUN \ apt-get clean ARG PG_VERSION=16.4 -ARG SDK_VERSION=3.1.74.3bi +ARG SDK_VERSION=3.1.61.6bi ARG DEBUG=false ARG OBJDUMP=true From 6e2aad0a654f925be716dd2d46dcf826d3e9068f Mon Sep 17 00:00:00 2001 From: tudor Date: Wed, 12 Mar 2025 16:06:29 +0100 Subject: [PATCH 2/3] extracting the tar was done exactly in the same folder as the one being deleted afterwards --- pglite/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pglite/Dockerfile b/pglite/Dockerfile index 49631040e8b79..22165033984d2 100644 --- a/pglite/Dockerfile +++ b/pglite/Dockerfile @@ -11,7 +11,7 @@ ENV \ SDKROOT=/opt/python-wasm-sdk \ SYS_PYTHON=/usr/bin/python3 \ DEBUG=$DEBUG \ - BUILDS=3.12 \ + BUILDS=3.13 \ EMFLAVOUR=3.1.74 WORKDIR /workspace @@ -27,8 +27,10 @@ RUN \ # 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 --single-branch --branch tudor/useCores https://github.com/electric-sql/portable-sdk.git RUN git clone --depth 1 https://github.com/electric-sql/portable-sdk.git + WORKDIR /workspace/portable-sdk/python-wasm-sdk # Make python-wasm-sdk @@ -52,17 +54,17 @@ ARG OBJDUMP=true ENV \ PG_VERSION=$PG_VERSION \ SDK_VERSION=$SDK_VERSION \ - SDK_ARCHIVE=python3.12-wasm-sdk-Ubuntu-22.04.tar.lz4 \ + SDK_ARCHIVE=python3.13-wasm-sdk-Ubuntu-22.04.tar.lz4 \ SDKROOT=/opt/python-wasm-sdk \ SYS_PYTHON=/usr/bin/python3 \ PGROOT=/tmp/pglite \ DEBUG=$DEBUG \ OBJDUMP=$OBJDUMP -COPY --from=build_sdk /tmp/sdk /tmp/sdk +COPY --from=build_sdk /tmp/sdk/$SDK_ARCHIVE /tmp/sdk/$SDK_ARCHIVE RUN tar --use-compress-program=lz4 -xvf /tmp/sdk/${SDK_ARCHIVE} -C / -RUN rm -r /tmp/sdk +RUN rm /tmp/sdk/$SDK_ARCHIVE WORKDIR /workspace \ No newline at end of file From 76993d8e437e7f19e37458e9fe2149bb2d06d630 Mon Sep 17 00:00:00 2001 From: tudor Date: Mon, 17 Mar 2025 10:25:36 +0100 Subject: [PATCH 3/3] use host platform for building pglite-builder; use multi core build --- pglite/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pglite/Dockerfile b/pglite/Dockerfile index 22165033984d2..0b820123a3783 100644 --- a/pglite/Dockerfile +++ b/pglite/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 AS build_sdk +FROM --platform=$BUILDPLATFORM ubuntu:22.04 AS build_sdk ARG PG_VERSION=16.4 ARG SDK_VERSION=3.1.61.6bi @@ -27,9 +27,7 @@ RUN \ # 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 --single-branch --branch tudor/useCores https://github.com/electric-sql/portable-sdk.git -RUN git clone --depth 1 https://github.com/electric-sql/portable-sdk.git - +RUN git clone --depth 1 --single-branch --branch tudor/useCores https://github.com/electric-sql/portable-sdk.git WORKDIR /workspace/portable-sdk/python-wasm-sdk