From cb982b8941307d58879cc4ee8e7f19ae334a8a59 Mon Sep 17 00:00:00 2001
From: Ana Ulin <ana@ulin.org>
Date: Wed, 22 May 2024 18:08:20 -0700
Subject: [PATCH 1/3] Make devcontainer have correct version of Ruby installed.

---
 .devcontainer/devcontainer.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 13231c3a4..da246f509 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -12,6 +12,9 @@
   "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/ruby:1": {
+      "version": "3.3.0"
+    },
     "node": {
       "version": "16",
       "nodeGypDependencies": true

From e4d0068d9a6cc7ef2ed8c3c05dc3bb7aaf786a6a Mon Sep 17 00:00:00 2001
From: Ana Ulin <ana@ulin.org>
Date: Wed, 22 May 2024 18:11:01 -0700
Subject: [PATCH 2/3] Temporarily run this on every branch push.

---
 .github/workflows/build-publish-devcontainer.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-publish-devcontainer.yml b/.github/workflows/build-publish-devcontainer.yml
index d0ee1968d..47b28fc1c 100644
--- a/.github/workflows/build-publish-devcontainer.yml
+++ b/.github/workflows/build-publish-devcontainer.yml
@@ -5,7 +5,7 @@
 name: Create and publish Docker devcontainer
 on:
   push:
-    branches: ['main', 'neighborhood/speed-up-devcontainer-startup'] # second branch is temporary for testing...
+    #branches: ['main', 'neighborhood/speed-up-devcontainer-startup'] # second branch is temporary for testing...
     paths:
       - .github/workflows/build-publish-devcontainer.yml
       - .devcontainer/Dockerfile

From 3b72f962cbecd24a42d6ca219c8611bc0bedb740 Mon Sep 17 00:00:00 2001
From: Ana Ulin <ana@ulin.org>
Date: Wed, 22 May 2024 18:14:41 -0700
Subject: [PATCH 3/3] Test

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fafc17e5c..0b7f4369b 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:3.3
+FROM mcr.microsoft.com/devcontainers/ruby:3.3.0
 
 LABEL org.opencontainers.image.source=https://github.com/zinc-collective/convene-devcontainer
 LABEL org.opencontainers.image.description="Container to facilitate easier development of convene, specifically to work in GitHub CodeSpaces."