From 65e48f359187097370010cdcd63d4784f6a3a1d7 Mon Sep 17 00:00:00 2001
From: Sambo Chea <sombochea@cubetiqs.com>
Date: Wed, 14 Jul 2021 18:18:37 +0700
Subject: [PATCH] Task: Fixed docker yarn and github actions

---
 .github/workflows/main.yml | 2 +-
 Dockerfile                 | 3 ++-
 entrypoint.sh              | 9 +++++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 36d6653..9e45eb3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,4 +12,4 @@ jobs:
       - name: Starter Docker Yarn Test
         uses: cubetiq/starter-docker-yarn-actions@main
         with:
-          run: docker version; node --version; yarn --version
\ No newline at end of file
+          run: docker version; echo Node: $(node --version); echo Yarn: $(yarn --version)
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c6f421b..44657d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,5 @@
-FROM cubetiq/calpine-docker:latest
+FROM cubetiq/calpine-docker-yarn:latest
+
 LABEL maintainer="sombochea@cubetiqs.com"
 
 COPY ./entrypoint.sh /entrypoint.sh
diff --git a/entrypoint.sh b/entrypoint.sh
index d775212..814bb07 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+#### Current working directory is: /github/workspace ####
+WORKDIR=$(pwd)
+echo "Working directory => $WORKDIR"
+
 if [ ! -z $INPUT_USERNAME ];
 then echo $INPUT_PASSWORD | docker login $INPUT_REGISTRY -u $INPUT_USERNAME --password-stdin
 fi
@@ -15,11 +19,12 @@ then INPUT_SHELL=sh
 fi
 
 if [ -z $INPUT_IMAGE ];
-then INPUT_IMAGE=cubetiq/calpine-docker-yarn
+then INPUT_IMAGE=cubetiq/calpine-docker-yarn:latest
 fi
 
 if [ -z $semicolon_delimited_script ];
 then semicolon_delimited_script="echo $(whoami)"
 fi
 
-exec docker run -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "`cat semicolon_delimited_script`"
\ No newline at end of file
+exec $INPUT_SHELL semicolon_delimited_script
+# exec docker run --workdir $WORKDIR -v "$WORKDIR":"$WORKDIR" -v "/var/run/docker.sock":"/var/run/docker.sock" $INPUT_OPTIONS --entrypoint=$INPUT_SHELL $INPUT_IMAGE -c "`cat semicolon_delimited_script`"
\ No newline at end of file