Merge pull request #837 from OpenSourceBrain/develop

v0.7.4

Author: filippomc

.github/workflows/docker-jupyterlab.yml

@@ -0,0 +1,25 @@
+name: Docker Image Build Jupyterlab
+
+on:
+  push:
+    branches: [ master, dev*, feature/docker* ]
+  pull_request:
+    branches: [ master, dev*, feature/docker* ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    
+    - name: Build the Docker image
+      run: |
+        cd applications/jupyterlab
+        docker build -t myjlab -f Dockerfile --no-cache .
+
+    - name: Info on Docker image sizes
+      run: |
+        docker images

.github/workflows/docker-netpyne.yml

@@ -0,0 +1,25 @@
+name: Docker Image Build NetPyNE-UI
+
+on:
+  push:
+    branches: [ master, dev*, feature/docker* ]
+  pull_request:
+    branches: [ master, dev*, feature/docker* ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build the Docker image
+      run: |
+        cd applications/netpyne
+        docker build -t mynpui -f Dockerfile --no-cache .
+        
+    - name: Info on Docker image sizes
+      run: |
+        docker images

.github/workflows/docker-nwbe.yml

@@ -0,0 +1,27 @@
+name: Docker Image Build NWB Explorer
+
+on:
+  push:
+    branches: [ master, dev*, feature/docker* ]
+  pull_request:
+    branches: [ master, dev*, feature/docker* ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Build the Docker image
+      run: |
+        cd applications/nwb-explorer
+        docker build -t mynwbosb -f Dockerfile --no-cache .
+        
+    - name: Info on Docker image sizes
+      run: |
+        docker images
+
+        

applications/accounts-api/backend/accounts_api/services/user_service.py

@@ -4,13 +4,11 @@
 from cloudharness.auth.quota import get_user_quotas
 from keycloak.exceptions import KeycloakGetError, KeycloakError
 from accounts_api.models import User
-from cloudharness.auth import AuthClient
+from cloudharness.auth import AuthClient, UserNotFound
 from cloudharness import log
 import typing
 # from cloudharness.models import User as CHUser # Cloudharness 2.0.0
 
-class UserNotFound(Exception): pass
-
 
 class UserNotAuthorized(Exception): pass
 
@@ -20,7 +18,8 @@ def get_user(username_or_id: str) -> User:
     try:
 
         kc_user = client.get_user(username_or_id)
-
+    except UserNotFound:
+        raise
     except KeycloakGetError as e:
         if e.response_code == 404:
             raise UserNotFound(username_or_id)

applications/accounts/themes/custom/login/resources/css/login.css

@@ -19,7 +19,7 @@ body {
 }
 
 .login-pf-logo {
-  background: url(../img/osblogo.png) no-repeat;
+  background: url(../img/osb-logo.png) no-repeat;
   background-size: contain;
   width: 132px;
   height: 20px;

applications/accounts/themes/custom/login/resources/img/favicon.svg

@@ -13,7 +13,7 @@
         </#list>
     </#if>
     <title>${msg("loginTitle",(realm.displayName!''))}</title>
-    <link rel="icon" href="${url.resourcesPath}/img/favicon.ico" />
+    <link rel="icon" href="${url.resourcesPath}/img/favicon.svg" />
     <#if properties.stylesCommon?has_content>
         <#list properties.stylesCommon?split(' ') as style>
             <link href="${url.resourcesCommonPath}/${style}" rel="stylesheet" />

applications/accounts/themes/custom/login/resources/img/osb-logo.png

@@ -0,0 +1 @@
+/deploy