fix(pipe): remove jq from Dockerfile and improve stash handling in pipe.sh

Author: tomerh2001

Dockerfile

@@ -6,7 +6,7 @@ ENV SECRET_KEY=$SECRET_KEY
 VOLUME /repo
 WORKDIR /repo
 
-RUN apk add --update --no-cache bash git git-crypt jq
+RUN apk add --update --no-cache bash git git-crypt
 COPY pipe.sh /
 
 ENTRYPOINT ["/pipe.sh"]

pipe.sh

@@ -1,7 +1,5 @@
 #!/bin/sh
 
-cat package.json | jq .version
-
 # Check for the presence of the SECRETS_KEY environment variable
 if [ -z "$SECRETS_KEY" ]; then
     echo "SECRETS_KEY environment variable is missing."
@@ -15,6 +13,7 @@ git config --global --add safe.directory ${PWD}
 if [ $GIT_STASH = "true" ]; then
     echo "Stashing changes"
     git stash
+
 fi
 
 echo "$SECRETS_KEY" | base64 -d > /tmp/secrets.key
@@ -24,7 +23,7 @@ git-crypt unlock /tmp/secrets.key
 rm -f /tmp/secrets.key
 echo "Decrypted git-crypt files"
 
-if [ $GIT_STASH = "true" ]; then
-    echo "Applying stash"
-    git stash apply
-fi
+if [ "$GIT_STASH" = "true" ] && [ "$(git stash list | wc -l)" -gt 0 ]; then
+    echo "Applying stashed changes"
+    git stash pop
+fi