From 1599120c3eff94011c9d94143c046fe805cc2792 Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Thu, 14 Jan 2021 08:33:26 -0500
Subject: [PATCH] fix: hardcode cnb workdir to /workspace

Closes #4317
---
 plugins/common/functions                       | 2 ++
 plugins/scheduler-docker-local/scheduler-enter | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/common/functions b/plugins/common/functions
index f0d3f2a29..45fa2998f 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -468,6 +468,8 @@ copy_from_image() {
     if ! is_abs_path "$SRC_FILE"; then
       if is_image_herokuish_based "$IMAGE" "$APP"; then
         WORKDIR="/app"
+      elif is_image_cnb_based "$IMAGE"; then
+        WORKDIR="/workspace"
       else
         WORKDIR="$("$DOCKER_BIN" image inspect --format '{{.Config.WorkingDir}}' "$IMAGE")"
       fi
diff --git a/plugins/scheduler-docker-local/scheduler-enter b/plugins/scheduler-docker-local/scheduler-enter
index a41ba178a..b6b2a024d 100755
--- a/plugins/scheduler-docker-local/scheduler-enter
+++ b/plugins/scheduler-docker-local/scheduler-enter
@@ -73,7 +73,7 @@ trigger-scheduler-docker-local-scheduler-enter() {
   has_tty && local DOKKU_RUN_OPTS+=" -i -t"
   local IMAGE="$("$DOCKER_BIN" container inspect --format '{{ .Config.Image }}' "$CONTAINER_ID")"
   is_image_herokuish_based "$IMAGE" "$APP" && EXEC_CMD="/exec"
-  is_image_cnb_based "$IMAGE" && EXEC_CMD="" && DOKKU_RUN_OPTS+=" -w /app"
+  is_image_cnb_based "$IMAGE" && EXEC_CMD="" && DOKKU_RUN_OPTS+=" -w /workspace"
   # shellcheck disable=SC2086
   "$DOCKER_BIN" container exec $DOKKU_RUN_OPTS "$CONTAINER_ID" $EXEC_CMD "${@:-$DOKKU_APP_SHELL}"
 }