From f0fa8f13f5ba486c9c4a271a14dca13ac40c8071 Mon Sep 17 00:00:00 2001
From: casjay <git-admin@casjaysdev.com>
Date: Thu, 27 Oct 2022 17:12:29 -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                               | 12 ++++++------
 rootfs/usr/local/bin/start-commitment.sh | 13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 2022022..c7c5bc0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM casjaysdevdocker/alpine:latest AS build
+FROM casjaysdevdocker/python3:latest AS build
 
 ARG ALPINE_VERSION="v3.16"
 
@@ -25,7 +25,7 @@ RUN set -ex; \
   echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/community" >>"/etc/apk/repositories"; \
   if [ "${ALPINE_VERSION}" = "edge" ]; then echo "http://dl-cdn.alpinelinux.org/alpine/${ALPINE_VERSION}/testing" >>"/etc/apk/repositories" ; fi ; \
   apk update --update-cache && apk add --no-cache ${PACK_LIST} && \
-  echo
+  git clone -q https://github.com/casjay-heroku/commitment /app
 
 RUN echo 'Running cleanup' ; \
   rm -Rf /usr/share/doc/* /usr/share/info/* /tmp/* /var/tmp/* ; \
@@ -42,8 +42,8 @@ RUN echo 'Running cleanup' ; \
 FROM scratch
 
 ARG \
-  SERVICE_PORT="80" \
-  EXPOSE_PORTS="80" \
+  SERVICE_PORT="5000" \
+  EXPOSE_PORTS="5000" \
   PHP_SERVER="commitment" \
   NODE_VERSION="system" \
   NODE_MANAGER="system" \
@@ -85,9 +85,9 @@ ENV LANG=en_US.UTF-8 \
 COPY --from=build /. /
 
 USER root
-WORKDIR /root
+WORKDIR /app
 
-VOLUME [ "/config","/data" ]
+#VOLUME [ "/config","/data" ]
 
 EXPOSE $EXPOSE_PORTS
 
diff --git a/rootfs/usr/local/bin/start-commitment.sh b/rootfs/usr/local/bin/start-commitment.sh
index feb75e4..7bb9eca 100755
--- a/rootfs/usr/local/bin/start-commitment.sh
+++ b/rootfs/usr/local/bin/start-commitment.sh
@@ -12,8 +12,8 @@
 # @@Description      :  script to start commitment
 # @@Changelog        :  New script
 # @@TODO             :  Better documentation
-# @@Other            :  
-# @@Resource         :  
+# @@Other            :
+# @@Resource         :
 # @@Terminal App     :  no
 # @@sudo/root        :  no
 # @@Template         :  other/start-service
@@ -34,8 +34,7 @@ __certbot() {
 __heath_check() {
   status=0 health="Good"
   __pgrep ${1:-} &>/dev/null || status=$((status + 1))
-  #__curl "http://localhost:$SERVICE_PORT/server-health" || status=$((status + 1))
-  [ "$status" -eq 0 ] || health="Errors reported see docker logs --follow $CONTAINER_NAME"
+  __curl "http://localhost:$SERVICE_PORT/txt" || status=$((status + 1))
   return ${status:-$?}
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -74,9 +73,9 @@ DEFAULT_TEMPLATE_DIR="${DEFAULT_TEMPLATE_DIR:-/usr/local/share/template-files/de
 CONTAINER_IP_ADDRESS="$(ip a 2>/dev/null | grep 'inet' | grep -v '127.0.0.1' | awk '{print $2}' | sed 's|/.*||g')"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Overwrite variables
-#SERVICE_PORT=""
+#SERVICE_PORT="5000"
 SERVICE_NAME="commitment"
-SERVICE_COMMAND="$SERVICE_NAME"
+SERVICE_COMMAND="python3 /app/commitment.py"
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Show start message
@@ -124,7 +123,7 @@ fi
 [ -f "/config/.env.sh" ] && . "/config/.env.sh"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Actions based on env
-
+cd /app || exit 10
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # begin main app
 case "$1" in