From 80746b0b0cc03a34e4addb35d629c4baa45dc5cd Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Sat, 11 May 2024 15:01:26 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=97=EF=B8=8F=20Modified=20the=20Docker?=
 =?UTF-8?q?file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile   | 15 +++++++++------
 package.json |  2 +-
 yarn.lock    |  8 ++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 324fee3..9576429 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,17 +3,20 @@ LABEL maintainer="Rishi Ghan <rishi.ghan@gmail.com>"
 
 WORKDIR /threetwo
 
+# Copy package.json and lock file first to leverage Docker cache
 COPY package.json ./
 COPY yarn.lock ./
-COPY nodemon.json ./
-COPY jsdoc.json ./
 
-# RUN apt-get update && apt-get install -y git python3 build-essential autoconf automake g++ libpng-dev make
-RUN apk --no-cache add g++ make libpng-dev git python3 libc6-compat autoconf automake libjpeg-turbo-dev libpng-dev mesa-dev mesa libxi build-base gcc libtool nasm
-RUN yarn --ignore-engines
+# Install build dependencies necessary for native modules
+RUN apk --no-cache add g++ make libpng-dev git python3 autoconf automake libjpeg-turbo-dev mesa-dev mesa libxi build-base gcc libtool nasm
 
+# Install node modules
+RUN yarn install --ignore-engines
 
+# Copy the rest of the application
 COPY . .
+
 EXPOSE 5173
 
-ENTRYPOINT [ "npm", "start" ]
\ No newline at end of file
+# Use yarn start if you want to stick with yarn, or change to npm start if you prefer npm
+ENTRYPOINT [ "yarn", "start" ]
diff --git a/package.json b/package.json
index fcf0a9d..2fc5a65 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "prettier": "^2.2.1",
     "react-refresh": "^0.14.0",
     "rimraf": "^4.1.3",
-    "sass": "^1.69.5",
+    "sass": "^1.77.0",
     "storybook": "^7.3.2",
     "tailwindcss": "^3.4.1",
     "tui-jsdoc-template": "^1.2.2",
diff --git a/yarn.lock b/yarn.lock
index d594f40..275262a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9600,10 +9600,10 @@ safe-regex-test@^1.0.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass@^1.69.5:
-  version "1.70.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.70.0.tgz#761197419d97b5358cb25f9dd38c176a8a270a75"
-  integrity sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==
+sass@^1.77.0:
+  version "1.77.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.0.tgz#e736c69aff9fae4a4e6dae60a979eee9c942f321"
+  integrity sha512-eGj4HNfXqBWtSnvItNkn7B6icqH14i3CiCGbzMKs3BAPTq62pp9NBYsBgyN4cA+qssqo9r26lW4JSvlaUUWbgw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"