Skip to content

Commit

Permalink
More container directory organization (jupyter-server#146)
Browse files Browse the repository at this point in the history
* setup git directory properly

* Bump to 0.12.12
  • Loading branch information
Zsailer authored and GitHub Enterprise committed Sep 10, 2021
1 parent 0267a79 commit 46b22f8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion data_studio_jupyter_extensions/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.12.11" # pragma: no cover
__version__ = "0.12.12" # pragma: no cover
6 changes: 3 additions & 3 deletions deployment/bin/setup_notebook_directory.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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+))?
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.12.11
0.12.12

0 comments on commit 46b22f8

Please sign in to comment.