From 9adf24b9a06d671170dc1b6a8c4f505b4781fe15 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Tue, 25 Oct 2022 18:30:44 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?=
 =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile                               | 8 ++++----
 rootfs/usr/local/bin/setup_soft-serve.sh | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e803911..ed3f4f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ARG DEFAULT_DATA_DIR="/usr/local/share/template-files/data" \
   DEFAULT_CONF_DIR="/usr/local/share/template-files/config" \
   DEFAULT_TEMPLATE_DIR="/usr/local/share/template-files/defaults"
 
-ARG PACK_LIST="bash"
+ARG PACK_LIST="bash git"
 
 ENV LANG=en_US.UTF-8 \
   ENV=ENV=~/.bashrc \
@@ -16,7 +16,7 @@ ENV LANG=en_US.UTF-8 \
   TERM="xterm-256color" \
   TIMEZONE="${TZ:-$TIMEZONE}" \
   HOSTNAME="casjaysdev-soft-serve" \
-  SOFT_SERVE_VERSION="${SOFT_SERVE_VERSION:-0.4.0}"
+  SOFT_SERVE_VERSION="${SOFT_SERVE_VERSION}"
 
 COPY ./rootfs/. /
 
@@ -45,8 +45,8 @@ RUN echo 'Running cleanup' ; \
 FROM scratch
 
 ARG \
-  SERVICE_PORT="80" \
-  EXPOSE_PORTS="80" \
+  SERVICE_PORT="23231" \
+  EXPOSE_PORTS="23231" \
   PHP_SERVER="soft-serve" \
   NODE_VERSION="system" \
   NODE_MANAGER="system" \
diff --git a/rootfs/usr/local/bin/setup_soft-serve.sh b/rootfs/usr/local/bin/setup_soft-serve.sh
index e10f465..7e96f97 100755
--- a/rootfs/usr/local/bin/setup_soft-serve.sh
+++ b/rootfs/usr/local/bin/setup_soft-serve.sh
@@ -24,10 +24,10 @@ SOFT_SERVE_VERSION="${SOFT_SERVE_VERSION:-0.4.0}"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if [ "$OS_ARCH" = "aarch64" ]; then
   FILE="/tmp/soft-serve.${OS_ARCH}tar.gz"
-  URL="https://github.com/charmbracelet/soft-serve/releases/latest/soft-serve_${SOFT_SERVE_VERSION}_linux_arm64.tar.gz"
+  URL="https://github.com/charmbracelet/soft-serve/releases/download/v${SOFT_SERVE_VERSION}/soft-serve_${SOFT_SERVE_VERSION}_linux_arm64.tar.gz"
 elif [ "$OS_ARCH" = "x86_64" ]; then
   FILE="/tmp/soft-serve.${OS_ARCH}tar.gz"
-  URL="https://github.com/charmbracelet/soft-serve/releases/download/v0.4.0/soft-serve_${SOFT_SERVE_VERSION}_linux_x86_64.tar.gz"
+  URL="https://github.com/charmbracelet/soft-serve/releases/download/v${SOFT_SERVE_VERSION}/soft-serve_${SOFT_SERVE_VERSION}_linux_x86_64.tar.gz"
 fi
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Main application