merge jupyterhub => docker

Author: casperdcl

.github/workflows/c-cpp.yml

@@ -7,31 +7,26 @@ on:
     - 'docker/Dockerfile'
     - 'docker/*yml'
     - '**.md'
-    - 'jupyterhub/**'
     - 'VirtualBox/**'
     - '.github/workflows/*docker*'
     - 'CITATION.cff'
     - '.mailmap'
     - '.travis.yml'
     - 'NOTICE.txt'
     - 'LICENSE.txt'
-    
   pull_request:
     branches: [ master ]
     paths-ignore:
     - 'docker/Dockerfile'
     - 'docker/*yml'
     - '**.md'
-    - 'jupyterhub/**'
     - 'VirtualBox/**'
     - '.github/workflows/*docker*'
     - 'CITATION.cff'
     - '.mailmap'
     - '.travis.yml'
     - 'NOTICE.txt'
     - 'LICENSE.txt'
-    
-
 jobs:
   build:
 
@@ -94,7 +89,7 @@ jobs:
            esac
 
     - name: install_dependencies
-      run: 
+      run:
           cd docker;
           sudo bash raw-ubuntu.sh;
           sudo bash build_essential-ubuntu.sh;
@@ -146,7 +141,7 @@ jobs:
           cmake -S ${GITHUB_WORKSPACE} ${BUILD_FLAGS} ${EXTRA_BUILD_FLAGS} ${DEVEL_BUILD};
     - name: build
       shell: bash
-      run: | 
+      run: |
           cd ${GITHUB_WORKSPACE}/build;
           source ~/virtualenv/bin/activate;
           cmake --build . -j 2;
@@ -167,5 +162,5 @@ jobs:
 
     - name: tests
       shell: bash
-      run: 
+      run:
           bash docker/ctest_sirf.sh

.github/workflows/docker_build.yml

@@ -5,7 +5,6 @@ on:
     branches: [ master ]
     paths-ignore:
     - '**.md'
-    - 'jupyterhub/**'
     - 'VirtualBox/**'
     - '.github/workflows/c-cpp.yml'
     - 'CITATION.cff'
@@ -18,7 +17,6 @@ on:
     branches: [ master ]
     paths-ignore:
     - '**.md'
-    - 'jupyterhub/**'
     - 'VirtualBox/**'
     - '.github/workflows/c-cpp.yml'
     - 'CITATION.cff'

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "jupyterhub/docker-stacks"]
-	path = jupyterhub/docker-stacks
+[submodule "docker/docker-stacks"]
+	path = docker/docker-stacks
 	url = https://github.com/jupyter/docker-stacks