From 3dbeadce50ce3b5dea64fb40637c88e042abad2f Mon Sep 17 00:00:00 2001 From: tokoko Date: Sat, 25 Oct 2025 17:13:42 +0000 Subject: [PATCH 1/2] fix: remove SHELL from devcontainer --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8371188..e6eb1c4 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,8 +1,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/python:3.13 USER vscode RUN curl -s "https://get.sdkman.io" | bash -SHELL ["/bin/bash", "-c"] -RUN source "/home/vscode/.sdkman/bin/sdkman-init.sh" && sdk install java 25-graalce +RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \ + sdk install java 25-graalce" RUN mkdir -p ~/lib && cd ~/lib && curl -L -O http://www.antlr.org/download/antlr-4.13.2-complete.jar ENV ANTLR_JAR="~/lib/antlr-4.13.1-complete.jar" # protoc 29.5 is the last version with protobuf python v5 which is compatible with protoletariat v3 diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 43c4646..6dd4da6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -2,8 +2,7 @@ "name": "substrait-python-devcontainer", "build": { "context": "..", - "dockerfile": "Dockerfile", - "options": ["--format=docker"] + "dockerfile": "Dockerfile" }, // Features to add to the dev container. More info: https://containers.dev/features. From 5856107a4611f759a9283a4a5202d3f42259cf5f Mon Sep 17 00:00:00 2001 From: Tornike Gurgenidze Date: Mon, 27 Oct 2025 17:23:14 +0400 Subject: [PATCH 2/2] Update .devcontainer/Dockerfile Co-authored-by: Niels Pardon --- .devcontainer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e6eb1c4..8d3354b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,7 +4,7 @@ RUN curl -s "https://get.sdkman.io" | bash RUN bash -c "source $HOME/.sdkman/bin/sdkman-init.sh && \ sdk install java 25-graalce" RUN mkdir -p ~/lib && cd ~/lib && curl -L -O http://www.antlr.org/download/antlr-4.13.2-complete.jar -ENV ANTLR_JAR="~/lib/antlr-4.13.1-complete.jar" +ENV ANTLR_JAR="~/lib/antlr-4.13.2-complete.jar" # protoc 29.5 is the last version with protobuf python v5 which is compatible with protoletariat v3 RUN cd ~ && curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v29.5/protoc-29.5-linux-x86_64.zip && \ unzip protoc-29.5-linux-x86_64.zip -d ~/.local && \