diff --git a/.dockerignore b/.dockerignore index 7b5dae9..8fb78a9 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ .github/ -GitVersion.yml \ No newline at end of file +docs/ +GitVersion.yml +README.md +LICENSE diff --git a/Dockerfile b/Dockerfile index 64bd6cb..7c77371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ # - Code Server ARG OWNER=lscsde -ARG BASE_CONTAINER=quay.io/jupyter/minimal-notebook:python-3.12.11 +ARG BASE_CONTAINER=quay.io/jupyter/minimal-notebook:python-3.13.13 FROM $BASE_CONTAINER ARG TARGETOS TARGETARCH LABEL maintainer="lscsde" @@ -16,31 +16,42 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] USER root -COPY vsix vsix - RUN mamba install code-server \ && mamba clean --all -f -y \ && fix-permissions "${CONDA_DIR}" \ && fix-permissions "/home/${NB_USER}" -RUN code-server --install-extension charliermarsh.ruff -RUN code-server --install-extension databricks.databricks -RUN code-server --install-extension databricks.sqltools-databricks-driver -RUN code-server --install-extension davidanson.vscode-markdownlint + + +# Install all extensions in one layer: aids faster build and smaller image +RUN code-server --install-extension charliermarsh.ruff \ + && code-server --install-extension databricks.databricks \ + && code-server --install-extension databricks.sqltools-databricks-driver \ + && code-server --install-extension davidanson.vscode-markdownlint \ + && code-server --install-extension ms-python.black-formatter \ + && code-server --install-extension ms-python.python \ + && code-server --install-extension mtxr.sqltools \ + && code-server --install-extension njpwerner.autodocstring \ + && code-server --install-extension tobikodata.sqlmesh \ + && rm -rf vsix + +# RUN code-server --install-extension charliermarsh.ruff +# RUN code-server --install-extension databricks.databricks +# RUN code-server --install-extension databricks.sqltools-databricks-driver +# RUN code-server --install-extension davidanson.vscode-markdownlint # RUN code-server --install-extension jannisx11.batch-rename-extension -RUN code-server --install-extension ms-python.black-formatter -RUN code-server --install-extension ms-python.python +# RUN code-server --install-extension ms-python.black-formatter +# RUN code-server --install-extension ms-python.python # RUN code-server --install-extension ms-toolsai.jupyter # RUN code-server --install-extension ms-toolsai.jupyter-renderers # RUN code-server --install-extension ms-toolsai.vscode-jupyter-cell-tags # RUN code-server --install-extension ms-toolsai.vscode-jupyter-keymap -RUN code-server --install-extension mtxr.sqltools -RUN code-server --install-extension njpwerner.autodocstring -RUN code-server --install-extension tobikodata.sqlmesh -RUN code-server --install-extension vsix/github.copilot-1.350.0-web.vsix -RUN code-server --install-extension vsix/github.copilot-chat-0.29.0.vsix +# RUN code-server --install-extension mtxr.sqltools +# RUN code-server --install-extension njpwerner.autodocstring +# RUN code-server --install-extension tobikodata.sqlmesh +# RUN code-server --install-extension vsix/github.copilot-1.350.0-web.vsix +# RUN code-server --install-extension vsix/github.copilot-chat-0.29.0.vsix -RUN rm -rf vsix # Copy custom config for jupyter COPY jupyter_notebook_config.json /etc/jupyter/jupyter_notebook_config.json @@ -66,4 +77,4 @@ RUN uv pip install --system -r requirements.txt && rm requirements.txt # Fix folder permissions and switch back to jovyan to avoid accidental container runs as root RUN fix-permissions "${CONDA_DIR}" \ && fix-permissions "/home/${NB_USER}" -USER ${NB_UID} \ No newline at end of file +USER ${NB_UID} diff --git a/requirements.txt b/requirements.txt index 36652b1..8fe4f05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ black -databricks-connect==15.4.* +databricks-connect==18.1.* isort jupyterlab_code_formatter jupyterlab-git pre-commit python-dotenv ruff -sqlmesh[web,mssql,databricks,lsp]~=0.217 \ No newline at end of file +sqlmesh[web,mssql,databricks,lsp]~=0.234.1 diff --git a/vsix/github.copilot-1.350.0-web.vsix b/vsix/github.copilot-1.350.0-web.vsix deleted file mode 100644 index bea93ba..0000000 Binary files a/vsix/github.copilot-1.350.0-web.vsix and /dev/null differ diff --git a/vsix/github.copilot-chat-0.29.0.vsix b/vsix/github.copilot-chat-0.29.0.vsix deleted file mode 100644 index e026e36..0000000 Binary files a/vsix/github.copilot-chat-0.29.0.vsix and /dev/null differ diff --git a/vsix/github.copilot-chat-0.30.0.vsix b/vsix/github.copilot-chat-0.30.0.vsix deleted file mode 100644 index 3955449..0000000 Binary files a/vsix/github.copilot-chat-0.30.0.vsix and /dev/null differ