From 1d7c957eafcdfffb17d0230f89f87c6a41584c57 Mon Sep 17 00:00:00 2001
From: Ben Mares <services-git-throwaway1@tensorial.com>
Date: Sat, 18 Nov 2023 00:08:20 +0100
Subject: [PATCH] Update devcontainer (#7017)

* Update dev container on release and schedule

* Use latest version of upstream dev container image

* Remove pre-commit cache hack

* Add Jupyter extension to container
---
 .github/workflows/devcontainer-docker-image.yml |  4 ++++
 .gitpod.yml                                     |  1 +
 scripts/dev.Dockerfile                          | 14 ++------------
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/devcontainer-docker-image.yml b/.github/workflows/devcontainer-docker-image.yml
index 7861f68be94..44c703dcc21 100644
--- a/.github/workflows/devcontainer-docker-image.yml
+++ b/.github/workflows/devcontainer-docker-image.yml
@@ -2,6 +2,10 @@ name: devcontainer-docker-image
 
 on:
   workflow_dispatch:
+  schedule:
+    - cron: "48 19 * * 5"  # Fridays at 19:48 UTC
+  release:
+    types: [published]
 
 env:
   REGISTRY: ghcr.io
diff --git a/.gitpod.yml b/.gitpod.yml
index 9420f6b574d..646aa47ea0d 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -36,6 +36,7 @@ vscode:
     - eamodio.gitlens
     - ms-python.python
     - ms-pyright.pyright
+    - ms-toolsai.jupyter
     - donjayamanne.githistory
 
 github:
diff --git a/scripts/dev.Dockerfile b/scripts/dev.Dockerfile
index 0d6fd204a21..c1df2cd540b 100644
--- a/scripts/dev.Dockerfile
+++ b/scripts/dev.Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/mamba-org/micromamba-devcontainer:git-e04d158
+FROM ghcr.io/mamba-org/micromamba-devcontainer:latest
 
 COPY --chown=${MAMBA_USER}:${MAMBA_USER} conda-envs/environment-dev.yml /tmp/environment-dev.yml
 RUN : \
@@ -8,15 +8,5 @@ RUN : \
     && sudo chmod -R a+rwx /opt/conda \
 ;
 
+# Run subsequent commands in an activated Conda environment
 ARG MAMBA_DOCKERFILE_ACTIVATE=1
-
-ENV PRE_COMMIT_HOME=/opt/.pre-commit-cache-prebuilt
-COPY --chown=${MAMBA_USER}:${MAMBA_USER} .pre-commit-config.yaml /fake-repo/.pre-commit-config.yaml
-RUN : \
-    && sudo mkdir --mode=777 /opt/.pre-commit-cache-prebuilt \
-    && cd /fake-repo \
-    && git init \
-    && pre-commit install-hooks \
-    && sudo rm -rf /fake-repo \
-    && sudo chmod -R a+rwx /opt/.pre-commit-cache-prebuilt \
-;