From 46b22f87d2130717cbbc645c9e365d19ccdd4db5 Mon Sep 17 00:00:00 2001
From: Zachary Sailer <zsailer@apple.com>
Date: Fri, 10 Sep 2021 11:44:20 -0700
Subject: [PATCH] More container directory organization (#146)

* setup git directory properly

* Bump to 0.12.12
---
 Dockerfile                                 | 4 ++--
 data_studio_jupyter_extensions/_version.py | 2 +-
 deployment/bin/setup_notebook_directory.sh | 6 +++---
 pyproject.toml                             | 2 +-
 version                                    | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d37e2d1626..02222b8620 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,11 +70,11 @@ ENV CONDA_DIR=/opt/conda \
     LANGUAGE=en_US.UTF-8 \
     PIP_INDEX_URL=https://pypi.apple.com/simple
 ENV PATH="${CONDA_DIR}/envs/${CONDA_ENV}/bin:${CONDA_DIR}/bin:${PATH}" \
-    HOME="/${NB_USER}" \
+    HOME="${APP_DIR}" \
     JUPYTER_PORT=8888
 
 # Add the user
-RUN useradd -d ${HOME} -m -s /bin/bash ${NB_USER}
+RUN useradd -d ${APP_DIR} -m -s /bin/bash ${NB_USER}
 
 COPY --from=build --chown=${NB_USER}:${NB_USER} ${CONDA_DIR} ${CONDA_DIR}
 COPY --chown=${NB_USER}:${NB_USER} deployment/config/condarc ${APP_DIR}/.condarc
diff --git a/data_studio_jupyter_extensions/_version.py b/data_studio_jupyter_extensions/_version.py
index e5337b6f1d..eb0a3198da 100644
--- a/data_studio_jupyter_extensions/_version.py
+++ b/data_studio_jupyter_extensions/_version.py
@@ -1 +1 @@
-__version__ = "0.12.11"  # pragma: no cover
+__version__ = "0.12.12"  # pragma: no cover
diff --git a/deployment/bin/setup_notebook_directory.sh b/deployment/bin/setup_notebook_directory.sh
index a86f8f744f..15d7123f47 100755
--- a/deployment/bin/setup_notebook_directory.sh
+++ b/deployment/bin/setup_notebook_directory.sh
@@ -61,15 +61,15 @@ if [[ ! -z $GITHUB_REPO ]]; then
         if [[ -e "$GITHUB_KEY_FILE" ]]; then
             setup_github_ssh_connection
 
-            if [[ "$(ls -A ${HOME}/Working)" ]]; then
+            if [[ "$(ls -A /app/Working)" ]]; then
                 echo "[INFO] Working directory is not empty. It will not be overwritten."
                 return
             else
                 echo "[INFO] Cloning $GITHUB_REPO into Working directory"
-                git clone -v $GITHUB_REPO ${HOME}/Working
+                git clone -v $GITHUB_REPO /app/Working
 
                 echo "[INFO] Switching to Working directory"
-                cd ${HOME}/Working
+                cd /app/Working
 
                 set_default_branch
 
diff --git a/pyproject.toml b/pyproject.toml
index dbb8fa1067..d7f162e909 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -23,7 +23,7 @@ testpaths = [
 ]
 
 [tool.tbump.version]
-current = "0.12.11"
+current = "0.12.12"
 regex = '''
   (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
   ((?P<channel>a|b|rc|.dev)(?P<release>\d+))?
diff --git a/version b/version
index 0801881ee0..a31499ef56 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.12.11
+0.12.12