From 136d83c7f7cb6672d0eef8a8b409a24725851163 Mon Sep 17 00:00:00 2001
From: Andrew Novoselac <andrew.novoselac@shopify.com>
Date: Wed, 22 May 2024 16:54:36 -0400
Subject: [PATCH] Specify Rust version 1.77 in ruby image devcontainer

There is an issue installing Ruby with Rust 1.78 on arm64. For now we will lock this image to 1.77 while that issue is investigated.
---
 features/activestorage/install.sh           | 5 ++++-
 features/mysql-client/install.sh            | 3 +++
 features/postgres-client/install.sh         | 3 +++
 features/ruby/install.sh                    | 3 +++
 features/sqlite3/install.sh                 | 3 +++
 images/ruby/.devcontainer/devcontainer.json | 3 +++
 6 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/features/activestorage/install.sh b/features/activestorage/install.sh
index e008bf1..ad6355e 100755
--- a/features/activestorage/install.sh
+++ b/features/activestorage/install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 apt-get update -qq && \
   apt-get install --no-install-recommends -y \
     libvips \
@@ -8,4 +11,4 @@ apt-get update -qq && \
     # mupdf mupdf-tools
     poppler-utils
 
-rm -rf /var/lib/apt/lists/*
\ No newline at end of file
+rm -rf /var/lib/apt/lists/*
diff --git a/features/mysql-client/install.sh b/features/mysql-client/install.sh
index ced2f3e..6dbc86f 100755
--- a/features/mysql-client/install.sh
+++ b/features/mysql-client/install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 apt-get update -y && apt-get -y install --no-install-recommends default-libmysqlclient-dev
 
 rm -rf /var/lib/apt/lists/*
diff --git a/features/postgres-client/install.sh b/features/postgres-client/install.sh
index 6c29bdc..9907853 100755
--- a/features/postgres-client/install.sh
+++ b/features/postgres-client/install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 apt-get update -y && apt-get -y install --no-install-recommends libpq-dev postgresql-client
 
 rm -rf /var/lib/apt/lists/*
diff --git a/features/ruby/install.sh b/features/ruby/install.sh
index 241897f..826361c 100755
--- a/features/ruby/install.sh
+++ b/features/ruby/install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 USERNAME="${USERNAME:-"${_REMOTE_USER:-"automatic"}"}"
 
 apt-get update -y
diff --git a/features/sqlite3/install.sh b/features/sqlite3/install.sh
index 9c79959..4343335 100755
--- a/features/sqlite3/install.sh
+++ b/features/sqlite3/install.sh
@@ -1,3 +1,6 @@
+#!/bin/sh
+set -e
+
 apt-get update -y && apt-get -y install --no-install-recommends pkg-config libsqlite3-dev sqlite3
 
 rm -rf /var/lib/apt/lists/*
diff --git a/images/ruby/.devcontainer/devcontainer.json b/images/ruby/.devcontainer/devcontainer.json
index 0edde11..730bbdd 100644
--- a/images/ruby/.devcontainer/devcontainer.json
+++ b/images/ruby/.devcontainer/devcontainer.json
@@ -17,6 +17,9 @@
     },
     "ghcr.io/rails/devcontainer/features/ruby": {
       "version": "${localEnv:RUBY_VERSION}"
+    },
+    "ghcr.io/devcontainers/features/rust:1": {
+      "version": "1.77"
     }
   },
   // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.