Merge branch 'master' into asalikhov/ubuntu_focal

.hadolint.yaml

+---
 ignored:
     - DL3006
     - DL3008

.readthedocs.yml

+---
 # .readthedocs.yml
 # Read the Docs configuration file
 # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

.travis.yml

+---
 dist: bionic
 language: python
 python:
-    - 3.7
+  - 3.7
 sudo: required
 services:
-    - docker
+  - docker
 
 jobs:
-  include:    
+  include:
     - stage: diff-test
       install:
-      - pip install --upgrade pip
-      - make dev-env
-      - make lint-install
+        - pip install --upgrade pip
+        - make dev-env
+        - make lint-install
       script:
-      - set -e
-      - if [ $(make n-docs-diff) -ne 0 ]; then make docs; fi;
-      - if [ $(make n-other-diff) -ne 0 ]; then make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"; fi;
+        - set -e
+        - if [ $(make n-docs-diff) -ne 0 ]; then make docs; fi;
+        - if [ $(make n-other-diff) -ne 0 ]; then make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"; fi;
     - stage: push-tx
       install:
-      - pip install --upgrade pip
-      - make dev-env
-      script: 
-      - if [ $(make n-docs-diff DIFF_RANGE=$TRAVIS_COMMIT_RANGE) -ne 0 ]; then make tx-en; fi;
+        - pip install --upgrade pip
+        - make dev-env
+      script:
+        - if [ $(make n-docs-diff DIFF_RANGE=$TRAVIS_COMMIT_RANGE) -ne 0 ]; then make tx-en; fi;
     - stage: full-test
       install:
-      - pip install --upgrade pip
-      - make dev-env
-      - make lint-install
+        - pip install --upgrade pip
+        - make dev-env
+        - make lint-install
       script:
-      - set -e
-      - make docs
-      - make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"
+        - set -e
+        - make docs
+        - make lint-build-test-all DARGS="--build-arg TEST_ONLY_BUILD=1"
 
 stages:
-    - name: diff-test
-      if: type = pull_request
-    - name: push-tx
-      if: type = push AND branch = master
-    - name: full-test
-      if: type = cron AND branch = master
+  - name: diff-test
+    if: type = pull_request
+  - name: push-tx
+    if: type = push AND branch = master
+  - name: full-test
+    if: type = cron AND branch = master
 
 env:
   global:
+    # yamllint disable-line
     secure: JDQKgB1laaenzmEGI9gduwK/iS0030qsl62njJg3jib0R8wxBi2OeetEdoGl9m4NFsqqnp0OO7nm4rzGfuwjL1A38flSlXOTxhjm/hvo3vmnqVu5lDcdk9+IRkafnfd3Dyd86tLxRVETOqZwCLmdNkB2fmQII8du5IIqbJuUGp8DrG7kVMf3NBr9rjkZRfByQrgG4s1NXuT61VvpWMPJAOhcrImuHBheVJDEV0U3n6Xavd7Wo+pAHrHU8exvYTZ1IzZMbHc6K0iC/NpCHcH9+9DAeLDk/q1aDNqbTExnQevOHZzNqgHC2qFOlN4jfy/TLYLpLXtUismneBBqVSK3iZso3Vqy2BRXWgouI+Tt+08ffocy9XPwEzSwkgPgDlFVUikPOy5imwjpDb13RMIyMY4CKlSOdQx2rH2kPkZ0MJJPcki3KGuGl3qRvqyblMn+lZvjAu6WVLZfo7EtcxsQ0ZZxbAbGoUVl27FHg+UvIfC0I3wEcZIp7oED47Q8s0MdCijD3AwkRPvx/iyp3J0A42su7kkOooFcmUItEIqegQJ4Aki1FBv2i5vHmBobClktytZceLsKvzCeLjMpL9HcUVfUaJDKRwtUYIozpYeBnac+E6J1s6glcqLrXIHWez8N6SzokBa6SPqdtODdzzk5OJupByub6CYWsRXvxIQ7/wI=

base-notebook/start-notebook.sh

@@ -6,14 +6,14 @@ set -e
 
 wrapper=""
 if [[ "${RESTARTABLE}" == "yes" ]]; then
-  wrapper="run-one-constantly"
+    wrapper="run-one-constantly"
 fi
 
 if [[ ! -z "${JUPYTERHUB_API_TOKEN}" ]]; then
-  # launched by JupyterHub, use single-user entrypoint
-  exec /usr/local/bin/start-singleuser.sh "$@"
+    # launched by JupyterHub, use single-user entrypoint
+    exec /usr/local/bin/start-singleuser.sh "$@"
 elif [[ ! -z "${JUPYTER_ENABLE_LAB}" ]]; then
-  . /usr/local/bin/start.sh $wrapper jupyter lab "$@"
+    . /usr/local/bin/start.sh $wrapper jupyter lab "$@"
 else
-  . /usr/local/bin/start.sh $wrapper jupyter notebook "$@"
+    . /usr/local/bin/start.sh $wrapper jupyter notebook "$@"
 fi

base-notebook/start-singleuser.sh

@@ -6,7 +6,7 @@ set -e
 
 # set default ip to 0.0.0.0
 if [[ "$NOTEBOOK_ARGS $@" != *"--ip="* ]]; then
-  NOTEBOOK_ARGS="--ip=0.0.0.0 $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--ip=0.0.0.0 $NOTEBOOK_ARGS"
 fi
 
 # handle some deprecated environment variables
@@ -14,25 +14,25 @@ fi
 # These won't be passed from DockerSpawner 0.9,
 # so avoid specifying --arg=empty-string
 if [ ! -z "$NOTEBOOK_DIR" ]; then
-  NOTEBOOK_ARGS="--notebook-dir='$NOTEBOOK_DIR' $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--notebook-dir='$NOTEBOOK_DIR' $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_PORT" ]; then
-  NOTEBOOK_ARGS="--port=$JPY_PORT $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--port=$JPY_PORT $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_USER" ]; then
-  NOTEBOOK_ARGS="--user=$JPY_USER $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--user=$JPY_USER $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_COOKIE_NAME" ]; then
-  NOTEBOOK_ARGS="--cookie-name=$JPY_COOKIE_NAME $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--cookie-name=$JPY_COOKIE_NAME $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_BASE_URL" ]; then
-  NOTEBOOK_ARGS="--base-url=$JPY_BASE_URL $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--base-url=$JPY_BASE_URL $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_HUB_PREFIX" ]; then
-  NOTEBOOK_ARGS="--hub-prefix=$JPY_HUB_PREFIX $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--hub-prefix=$JPY_HUB_PREFIX $NOTEBOOK_ARGS"
 fi
 if [ ! -z "$JPY_HUB_API_URL" ]; then
-  NOTEBOOK_ARGS="--hub-api-url=$JPY_HUB_API_URL $NOTEBOOK_ARGS"
+    NOTEBOOK_ARGS="--hub-api-url=$JPY_HUB_API_URL $NOTEBOOK_ARGS"
 fi
 NOTEBOOK_BIN="jupyterhub-singleuser"
 

examples/docker-compose/bin/letsencrypt.sh

@@ -9,12 +9,12 @@ set -e
 
 # Get domain and email from environment
 [ -z "$FQDN" ] && \
-	echo "ERROR: Must set FQDN environment varable" && \
-  exit 1
+    echo "ERROR: Must set FQDN environment varable" && \
+    exit 1
 
 [ -z "$EMAIL" ] && \
-	echo "ERROR: Must set EMAIL environment varable" && \
-  exit 1
+    echo "ERROR: Must set EMAIL environment varable" && \
+    exit 1
 
 # letsencrypt certificate server type (default is production).
 # Set `CERT_SERVER=--staging` for staging.
@@ -25,24 +25,24 @@ set -e
 docker volume create --name $SECRETS_VOLUME 1>/dev/null
 # Generate the cert and save it to the Docker volume
 docker run --rm -it \
-  -p 80:80 \
-  -v $SECRETS_VOLUME:/etc/letsencrypt \
-  quay.io/letsencrypt/letsencrypt:latest \
-  certonly \
-  --non-interactive \
-  --keep-until-expiring \
-  --standalone \
-  --standalone-supported-challenges http-01 \
-  --agree-tos \
-  --domain "$FQDN" \
-  --email "$EMAIL" \
-  $CERT_SERVER
+    -p 80:80 \
+    -v $SECRETS_VOLUME:/etc/letsencrypt \
+    quay.io/letsencrypt/letsencrypt:latest \
+    certonly \
+    --non-interactive \
+    --keep-until-expiring \
+    --standalone \
+    --standalone-supported-challenges http-01 \
+    --agree-tos \
+    --domain "$FQDN" \
+    --email "$EMAIL" \
+    $CERT_SERVER
 
 # Set permissions so nobody can read the cert and key.
 # Also symlink the certs into the root of the /etc/letsencrypt
 # directory so that the FQDN doesn't have to be known later.
 docker run --rm -it \
-  -v $SECRETS_VOLUME:/etc/letsencrypt \
-  ubuntu:20.04 \
-		bash -c "ln -s /etc/letsencrypt/live/$FQDN/* /etc/letsencrypt/ && \
-			find /etc/letsencrypt -type d -exec chmod 755 {} +"
+    -v $SECRETS_VOLUME:/etc/letsencrypt \
+    ubuntu:20.04 \
+    bash -c "ln -s /etc/letsencrypt/live/$FQDN/* /etc/letsencrypt/ && \
+        find /etc/letsencrypt -type d -exec chmod 755 {} +"

examples/docker-compose/bin/sl-dns.sh

@@ -15,8 +15,8 @@ MACHINE_NAME=$1 && [ -z "$MACHINE_NAME" ] && echo "$USAGE" && exit $E_BADARGS
 
 # Use SOFTLAYER_DOMAIN env var if domain name not set as second arg
 DOMAIN="${2:-$SOFTLAYER_DOMAIN}" && [ -z "$DOMAIN" ] && \
-	echo "Must specify domain or set SOFTLAYER_DOMAIN environment varable" && \
-	echo "$USAGE" && exit $E_BADARGS
+    echo "Must specify domain or set SOFTLAYER_DOMAIN environment varable" && \
+    echo "$USAGE" && exit $E_BADARGS
 
 IP=$(docker-machine ip "$MACHINE_NAME")
 

examples/docker-compose/notebook/letsencrypt-notebook.yml

+---
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
@@ -9,8 +10,8 @@ services:
     image: my-notebook
     container_name: ${NAME}
     volumes:
-     - "work:/home/jovyan/work"
-     - "secrets:/etc/letsencrypt"
+      - "work:/home/jovyan/work"
+      - "secrets:/etc/letsencrypt"
     ports:
       - "${PORT}:8888"
     environment:

examples/docker-compose/notebook/notebook.yml

+---
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
@@ -9,7 +10,7 @@ services:
     image: my-notebook
     container_name: ${NAME}
     volumes:
-     - "work:/home/jovyan/work"
+      - "work:/home/jovyan/work"
     ports:
       - "${PORT}:8888"
 

examples/docker-compose/notebook/secure-notebook.yml

+---
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
@@ -9,7 +10,7 @@ services:
     image: my-notebook
     container_name: ${NAME}
     volumes:
-     - "work:/home/jovyan/work"
+      - "work:/home/jovyan/work"
     ports:
       - "${PORT}:8888"
     environment:

examples/docker-compose/notebook/up.sh

@@ -11,8 +11,7 @@ USAGE="Usage: `basename $0` [--secure | --letsencrypt] [--password PASSWORD] [--
 # Parse args to determine security settings
 SECURE=${SECURE:=no}
 LETSENCRYPT=${LETSENCRYPT:=no}
-while [[ $# > 0 ]]
-do
+while [[ $# > 0 ]]; do
 key="$1"
 case $key in
     --secure)
@@ -37,25 +36,25 @@ shift # past argument or value
 done
 
 if [[ "$LETSENCRYPT" == yes || "$SECURE" == yes ]]; then
-  if [ -z "${PASSWORD:+x}" ]; then
-    echo "ERROR: Must set PASSWORD if running in secure mode"
-    echo "$USAGE"
-    exit 1
-  fi
-  if [ "$LETSENCRYPT" == yes ]; then
-    CONFIG=letsencrypt-notebook.yml
-    if [ -z "${SECRETS_VOLUME:+x}" ]; then
-      echo "ERROR: Must set SECRETS_VOLUME if running in letsencrypt mode"
-      echo "$USAGE"
-      exit 1
+    if [ -z "${PASSWORD:+x}" ]; then
+        echo "ERROR: Must set PASSWORD if running in secure mode"
+        echo "$USAGE"
+        exit 1
     fi
-  else
-    CONFIG=secure-notebook.yml
-  fi
-  export PORT=${PORT:=443}
+    if [ "$LETSENCRYPT" == yes ]; then
+        CONFIG=letsencrypt-notebook.yml
+        if [ -z "${SECRETS_VOLUME:+x}" ]; then
+            echo "ERROR: Must set SECRETS_VOLUME if running in letsencrypt mode"
+            echo "$USAGE"
+            exit 1
+        fi
+    else
+        CONFIG=secure-notebook.yml
+    fi
+    export PORT=${PORT:=443}
 else
-  CONFIG=notebook.yml
-  export PORT=${PORT:=80}
+    CONFIG=notebook.yml
+    export PORT=${PORT:=80}
 fi
 
 # Setup environment