General workflow updates + scripts.

Author: vladd-bit

.github/workflows/docker-jupyter-singleuser-gpu.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Git Sumbodule Update
         run: |
              git submodule update --init --recursive
-             git pull --recurse-submodules origin master
+             git pull --recurse-submodules origin main
              git submodule update --remote --recursive
 
       - name: Log in to Docker Hub

.github/workflows/docker-jupyter-singleuser.yml

@@ -53,7 +53,7 @@ jobs:
       - name: Git Sumbodule Update
         run: |
              git submodule update --init --recursive
-             git pull --recurse-submodules origin master
+             git pull --recurse-submodules origin main
              git submodule update --remote --recursive
 
       - name: Log in to Docker Hub

.github/workflows/submodule_sync.yml

@@ -3,9 +3,9 @@ name: submodules-sync
 on:
 
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
   release:
     types: [published]
@@ -35,7 +35,7 @@ jobs:
     - name: Git Sumbodule Update
       run: |
         git config pull.rebase false
-        git pull --recurse-submodules origin master
+        git pull --recurse-submodules origin main
         git submodule update --remote --recursive
 
     - name: Commit update

README.md

@@ -1,6 +1,6 @@
 # Introduction
 
-This repo has been reinstated. The custom jupyter-hub image is specified in the [CogStack-Nifi](https://github.com/CogStack/CogStack-NiFi/tree/master/services/jupyter-hub) project.
+This repo has been reinstated. The custom jupyter-hub image is specified in the [CogStack-Nifi](https://github.com/CogStack/CogStack-NiFi/tree/main/services/jupyter-hub) project.
 
 
 This repository contains a custom Jupyter Hub Docker image with example notebooks to play with. \
@@ -37,7 +37,7 @@ Full list found in [requirements.txt](./requirements.txt).
 
 ## Security
 
-Certificates used are located in the `./security/` folder, taken from the [Cogstack-NiFi](https://github.com/CogStack-NiFi) security folder, [root-ca.key](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.key) and [root-ca.pem](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-capem), read the [security section](https://cogstack-nifi.readthedocs.io/en/latest/security.html) for more info on how to generate them from the main NiFi repository.
+Certificates used are located in the `./security/` folder, taken from the [Cogstack-NiFi](https://github.com/CogStack-NiFi) security folder, [root-ca.key](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.key) and [root-ca.pem](https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-capem), read the [security section](https://cogstack-nifi.readthedocs.io/en/latest/security.html) for more info on how to generate them from the main NiFi repository.
 
 ## Setting up your own hub
 

config/jupyterhub_config.py

@@ -30,9 +30,6 @@ class LocalNativeAuthenticator(NativeAuthenticator, LocalAuthenticator):
 # using the DOCKER_SPAWN_CMD environment variable.
 spawn_cmd = os.environ.get("DOCKER_SPAWN_CMD", "start-singleuser.sh")
 
-c.DockerSpawner.extra_create_kwargs.update({"command": spawn_cmd})
-# c.DockerSpawner.extra_create_kwargs.update({ "volume_driver": "local" })
-
 # Connect containers to this Docker network
 # IMPORTANT, THIS MUST MATCH THE NETWORK DECLARED in "services.yml", by default: "cogstack-net"
 network_name = os.environ.get("DOCKER_NETWORK_NAME", "cogstack-net")
@@ -178,9 +175,7 @@ def pre_spawn_hook(spawner: DockerSpawner):
 c.PAMAuthenticator.admin_groups = {"wheel"}
 c.Authenticator.allowed_users = whitelist = set()
 
-
 #c.Authenticator.manage_groups = True
-
 #c.Authenticator.allow_all = True
 
 curr_dir = os.path.dirname(__file__)
@@ -206,6 +201,10 @@ def per_user_limit(role):
 
 # Spawn single-user servers as Docker containers
 c.JupyterHub.spawner_class = DockerSpawner
+
+# set DockerSpawner args
+c.DockerSpawner.extra_create_kwargs.update({"command": spawn_cmd})
+# c.DockerSpawner.extra_create_kwargs.update({ "volume_driver": "local" })
 c.DockerSpawner.extra_create_kwargs = {"user": "root"}
 
 with open(userlist_path) as f:
@@ -264,6 +263,7 @@ def per_user_limit(role):
     "GRANT_SUDO": "1",
     "UID": "0", # workaround https://github.com/jupyter/docker-stacks/pull/420,
 }
+
 c.DockerSpawner.environment.update(ENV_PROXIES)
 
 # Alternative, use: "nativeauthenticator.NativeAuthenticator"

notebooks/demo_working_with_cogstack

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
 
-curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/deploy/general.env > ./env/general.env
-curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.key > ./security/root-ca.key
-curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/master/security/root-ca.pem > ./security/root-ca.pem
+curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/deploy/general.env > ./env/general.env
+curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.key > ./security/root-ca.key
+curl https://raw.githubusercontent.com/CogStack/CogStack-NiFi/refs/heads/main/security/root-ca.pem > ./security/root-ca.pem