From 781d6a644850ae3410ac8860ac5b9d548fb38f06 Mon Sep 17 00:00:00 2001
From: Ryan Tanenholz <44756861+RockCrafts@users.noreply.github.com>
Date: Thu, 6 Feb 2025 20:17:09 -0500
Subject: [PATCH] redis, yarn, and fixes

---
 docker/waypoint/Dockerfile    | 16 ++++++++++++++--
 docker/waypoint/waypoint-init |  9 ++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/docker/waypoint/Dockerfile b/docker/waypoint/Dockerfile
index 1d35369a..1b465045 100644
--- a/docker/waypoint/Dockerfile
+++ b/docker/waypoint/Dockerfile
@@ -20,9 +20,15 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install --no-instal
     && ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \
     && dpkg-reconfigure -f noninteractive tzdata
 
-RUN apt-get update && apt-get install -y postgresql postgresql-contrib
+RUN apt-get update && apt-get install -y postgresql postgresql-contrib redis-server \
+  && rm -rf /var/lib/apt/lists/*
+
+# expose ports
+EXPOSE 5432
+EXPOSE 3000
+EXPOSE 8000
 
-# Install nvm, node, and npm
+# Install nvm, node, and npm, yarn
 ENV NVM_DIR /usr/local/nvm
 ENV NODE_VERSION 22
 
@@ -33,6 +39,12 @@ RUN mkdir -p $NVM_DIR && \
     nvm alias default $NODE_VERSION && \
     nvm use default
 
+RUN . $NVM_DIR/nvm.sh && npm install -g yarn
+
+# start redis and postgres service
+RUN redis-server --daemonize yes
+RUN service postgresql start
+
 # For each product, setup the python environment
 RUN mkdir /opt/waypoint/
 COPY waypoint-init /opt/waypoint/waypoint-init
diff --git a/docker/waypoint/waypoint-init b/docker/waypoint/waypoint-init
index d0eb9a93..bb0f887f 100644
--- a/docker/waypoint/waypoint-init
+++ b/docker/waypoint/waypoint-init
@@ -18,16 +18,15 @@ for product in "${!PRODUCT_TO_SHA[@]}"; do
   curl -o $PRODUCT_PATH/Pipfile "https://raw.githubusercontent.com/pennlabs/$product/$sha/backend/Pipfile"
   curl -o $PRODUCT_PATH/Pipfile.lock "https://raw.githubusercontent.com/pennlabs/$product/$sha/backend/Pipfile.lock"
 
-  pipenv requirements > $PRODUCT_PATH/requirements.txt
-
   uv venv "$PRODUCT_PATH/venv" --python 3.11
-  source "$PRODUCT_PATH/venv/bin/activate" && uv pip install -r $PRODUCT_PATH/requirements.txt
+  cd $PRODUCT_PATH
+  source "$PRODUCT_PATH/venv/bin/activate" && pipenv requirements --dev > requirements.txt && uv pip install -r $PRODUCT_PATH/requirements.txt
 done
 
 for product in "${!PRODUCT_TO_SHA[@]}"; do
-  PRODUCT_CODE_PATH="/usr/$product"
-  git clone "https://github.com/pennlabs/$product.git"
+  PRODUCT_CODE_PATH="/usr"
   cd "$PRODUCT_CODE_PATH"
+  git clone "https://github.com/pennlabs/$product.git"
   echo "Finished cloning $product"
 done