From 53520ea364d788bc25e72e010309676bd360e88b Mon Sep 17 00:00:00 2001
From: Ben Greenberg <hello@yalladevrel.com>
Date: Fri, 13 Sep 2024 15:46:56 +0300
Subject: [PATCH] working workflow

---
 .devcontainer/Dockerfile        | 15 ---------------
 .devcontainer/devcontainer.json |  7 ++-----
 .devcontainer/setup.sh          | 12 ------------
 .gitignore                      |  3 ++-
 4 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile
 delete mode 100755 .devcontainer/setup.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 2ad22c2..0000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM mcr.microsoft.com/devcontainers/javascript-node:0-20
-
-# Install Rust via rustup
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-# Set the PATH to include Cargo's bin directory
-ENV PATH="$HOME/.cargo/bin:$PATH"
-
-# Copy the application code
-COPY . .
-
-# Clone and install couchbase-shell
-RUN git clone https://github.com/couchbaselabs/couchbase-shell.git \
-    && cargo install --path ./couchbase-shell
-
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 5ab909e..7e50103 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,9 +1,6 @@
 {
     "name": "Vector Search Node.js Workshop",
-    "build": {
-      "dockerfile": "Dockerfile",
-      "context": "."
-    },
+    "image": "mcr.microsoft.com/devcontainers/javascript-node:0-20",
     "customizations": {
         "vscode": {
             "extensions": [
@@ -11,7 +8,7 @@
             ]
         }
     },
-    "postCreateCommand": "npm install",
+    "postCreateCommand": "npm install && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && PATH=\"$HOME/.cargo/bin:$PATH\" && git clone https://github.com/couchbaselabs/couchbase-shell.git && cargo install --path ./couchbase-shell",
     "features": {
         "ghcr.io/devcontainers/features/node:1": {}
     }
diff --git a/.devcontainer/setup.sh b/.devcontainer/setup.sh
deleted file mode 100755
index 76e7255..0000000
--- a/.devcontainer/setup.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-## Install rustup and common components
-curl https://sh.rustup.rs -sSf | sh -s -- -y 
-. "$HOME/.cargo/env"
-
-rustup install nightly
-rustup component add rustfmt
-rustup component add rustfmt --toolchain nightly
-rustup component add clippy 
-rustup component add clippy --toolchain nightly
-
-cargo install cargo-expand
-cargo install cargo-edit
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 0e851a7..2ed562f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .env
 node_modules/
-.DS_Store
\ No newline at end of file
+.DS_Store
+workshop_images/.DS_Store
\ No newline at end of file