From ce461b2541960d54005578d0b288b1dd9359b42b Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@rstudio.com>
Date: Wed, 24 Jun 2020 14:04:13 -0400
Subject: [PATCH 1/2] Add run-local target

for ease of running the same way as in CI, but locally
---
 Makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 1223a084..b3e45892 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,12 @@
 NB_UID := $(shell id -u)
 NB_GID := $(shell id -g)
 
-IMAGE := rstudio/rsconnect-jupyter-py
-VERSION := $(shell pipenv run python setup.py --version 2>/dev/null || echo 'NOTSET')
 BDIST_WHEEL := dist/rsconnect_jupyter-$(VERSION)-py2.py3-none-any.whl
-S3_PREFIX := s3://rstudio-connect-downloads/connect/rsconnect-jupyter
+IMAGE := rstudio/rsconnect-jupyter-py
+NOTEBOOKS_DIR := /notebooks
 PORT := $(shell printenv PORT || echo 9999)
+S3_PREFIX := s3://rstudio-connect-downloads/connect/rsconnect-jupyter
+VERSION := $(shell pipenv run python setup.py --version 2>/dev/null || echo 'NOTSET')
 
 JUPYTER_LOG_LEVEL ?= INFO
 
@@ -71,15 +72,20 @@ dist: version-frontend
 
 .PHONY: run
 run: install
+	mkdir -p $(NOTEBOOKS_DIR)
 	pipenv run jupyter notebook \
 		-y \
 		--log-level=$(JUPYTER_LOG_LEVEL) \
-		--notebook-dir=/notebooks \
+		--notebook-dir=$(NOTEBOOKS_DIR) \
 		--ip='0.0.0.0' \
 		--port=9999 \
 		--no-browser \
 		--NotebookApp.token=''
 
+.PHONY: run-local
+run-local: NOTEBOOKS_DIR := $(CURDIR)/notebooks3.8
+run-local: run
+
 .PHONY: install
 install: yarn
 	pipenv install --dev

From ed38712b91025b267f69a72ac383885d55c3c09c Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@rstudio.com>
Date: Wed, 24 Jun 2020 14:57:01 -0400
Subject: [PATCH 2/2] Reorder make vars for proper expansion

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index b3e45892..13ab40ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 NB_UID := $(shell id -u)
 NB_GID := $(shell id -g)
 
-BDIST_WHEEL := dist/rsconnect_jupyter-$(VERSION)-py2.py3-none-any.whl
 IMAGE := rstudio/rsconnect-jupyter-py
 NOTEBOOKS_DIR := /notebooks
 PORT := $(shell printenv PORT || echo 9999)
 S3_PREFIX := s3://rstudio-connect-downloads/connect/rsconnect-jupyter
 VERSION := $(shell pipenv run python setup.py --version 2>/dev/null || echo 'NOTSET')
 
+BDIST_WHEEL := dist/rsconnect_jupyter-$(VERSION)-py2.py3-none-any.whl
 JUPYTER_LOG_LEVEL ?= INFO
 
 # NOTE: See the `dist` target for why this exists.