feat(docker): make docker build with wren-modeling (#721)

Author: grieve54706

.github/workflows/build-dev-image.yml

@@ -72,6 +72,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./ibis-server
+          build-contexts: |
+            wren-modeling-py=./wren-modeling-py
+            wren-modeling-rs=./wren-modeling-rs
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/build-image.yml

@@ -85,6 +85,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./ibis-server
+          build-contexts: |
+            wren-modeling-py=./wren-modeling-py
+            wren-modeling-rs=./wren-modeling-rs
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

.github/workflows/stable-release.yml

@@ -128,6 +128,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: ./ibis-server
+          build-contexts: |
+            wren-modeling-py=./wren-modeling-py
+            wren-modeling-rs=./wren-modeling-rs
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}

ibis-server/.dockerignore

@@ -0,0 +1,6 @@
+.venv
+target
+docs
+tests
+.pre-commit-config.yaml
+.env

ibis-server/Dockerfile

@@ -1,8 +1,15 @@
-FROM python:3.11-buster as builder
+FROM python:3.11-buster AS builder
 
 # libpq-dev is required for psycopg2
 RUN apt-get update && apt-get -y install libpq-dev
 
+# Install rust
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y
+ENV PATH="/root/.cargo/bin:$PATH"
+
+# Install justfile
+RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/bin
+
     # python
 ENV PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -15,16 +22,17 @@ ENV PYTHONUNBUFFERED=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
     POETRY_VIRTUALENVS_CREATE=1
 
-RUN pip install poetry==1.7.1
+RUN pip install poetry==1.8.3
 
-WORKDIR /app
+COPY --from=wren-modeling-py . /wren-modeling-py
+COPY --from=wren-modeling-rs . /wren-modeling-rs
 
-COPY pyproject.toml ./
-COPY poetry.lock ./
+WORKDIR /app
+COPY . .
+RUN just install --without dev
 
-RUN poetry install --without dev
 
-FROM python:3.11-slim-buster as runtime
+FROM python:3.11-slim-buster AS runtime
 
 # libpq-dev is required for psycopg2
 # unixodbc-dev, freetds-dev and tdsodbc are required for pyodbc
@@ -62,4 +70,4 @@ COPY app app
 
 EXPOSE 8000
 
-ENTRYPOINT fastapi run
+CMD ["fastapi", "run"]

ibis-server/docs/development.md

@@ -23,9 +23,6 @@ just pre-commit-install
 ```
 This installs the pre-commit hooks.
 
-> [!WARNING]  
-> Before working on the application, you need to set up a Python virtual environment and install dependencies in the [wren-modeling-py](../../wren-modeling-py) directory.
-
 
 ## Start the server
 To get the application running:

ibis-server/justfile

@@ -2,7 +2,7 @@ default:
     @just --list --unsorted
 
 build-core:
-    cd ../wren-modeling-py && just build
+    cd ../wren-modeling-py && just install && just build
 
 core-wheel-path := "../wren-modeling-py/target/wheels/wren_modeling_py-*.whl"
 
@@ -13,8 +13,8 @@ install-core: build-core
 update-core: build-core
     poetry run pip install --force-reinstall {{core-wheel-path}}
 
-install:
-    poetry install
+install *args:
+    poetry install {{args}}
     just install-core
 
 pre-commit-install:
@@ -38,7 +38,10 @@ test MARKER:
 docker-build:
 # alias for `docker-build`
 dbuild:
-    docker image build . -t wren-engine-ibis
+    docker buildx build -t wren-engine-ibis -f Dockerfile \
+        --build-context wren-modeling-py=../wren-modeling-py \
+        --build-context wren-modeling-rs=../wren-modeling-rs \
+        .
 
 docker-run:
 # alias for `docker-run`

wren-modeling-py/.dockerignore

@@ -0,0 +1,5 @@
+.venv
+target
+tests
+README.md
+rustfmt.toml

wren-modeling-py/poetry.lock

@@ -1,8 +1,6 @@
 [project]
 name = "wren-modeling-py"
-classifiers = [
-    "Programming Language :: Python :: 3.11"
-]
+classifiers = ["Programming Language :: Python :: 3.11"]
 
 [tool.poetry]
 name = "wren-modeling-py"
@@ -12,16 +10,14 @@ authors = ["Canner <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = ">=3.11,<3.12"
+maturin = "1.7.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "8.3.1"
-maturin = "1.7.0"
 
 [tool.maturin]
 module-name = "wren_core"
-include = [
-    { path = "Cargo.lock", format = "sdist" }
-]
+include = [{ path = "Cargo.lock", format = "sdist" }]
 exclude = ["tests/**", "target/**"]
 locked = true
 

wren-modeling-py/pyproject.toml

@@ -0,0 +1,7 @@
+sqllogictest
+wren-example
+target
+README.md
+rustfmt.toml
+taplo.toml
+.gitignore