Merge pull request #4320 from dokku/4317-fix-cnb-workdir

Hardcode cnb workdir to /workspace

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

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}"
 }