Merge pull request #256 from SelfhostedPro/projects

remove envs from docker-compose commands
SelfhostedPro · Feb 6, 2021 · 3b3f944 · 3b3f944
2 parents c7d54fe + 2ce17e9
commit 3b3f944
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/backend/api/actions/compose.py b/backend/api/actions/compose.py
@@ -67,6 +67,7 @@ def compose_app_action(
                 "-d",
                 app,
                 _cwd=os.path.dirname(compose["path"]),
+                _env=None
             )
         except Exception as exc:
             raise HTTPException(400, exc.stderr.decode("UTF-8").rstrip())
@@ -77,6 +78,7 @@ def compose_app_action(
                 "--no-start",
                 app,
                 _cwd=os.path.dirname(compose["path"]),
+                _env=None
             )
         except Exception as exc:
             raise HTTPException(400, exc.stderr.decode("UTF-8").rstrip())
@@ -88,6 +90,7 @@ def compose_app_action(
                 "--stop",
                 app,
                 _cwd=os.path.dirname(compose["path"]),
+                _env=None
             )
         except Exception as exc:
             raise HTTPException(400, exc.stderr.decode("UTF-8").rstrip())
@@ -97,6 +100,7 @@ def compose_app_action(
                 action,
                 app,
                 _cwd=os.path.dirname(compose["path"]),
+                _env=None
             )
         except Exception as exc:
             raise HTTPException(400, exc.stderr.decode("UTF-8").rstrip())

diff --git a/backend/api/auth/auth.py b/backend/api/auth/auth.py
@@ -36,6 +36,9 @@ def auth_check(Authorize):
             return Authorize.jwt_required()
         except JWTDecodeError as exc:
             status_code = exc.status_code
-            if exc.message == "Signature verification failed":
+            if (
+                exc.message == "Signature verification failed"
+                or exc.message == "Signature has expired"
+            ):
                 status_code = 401
             raise HTTPException(status_code=status_code, detail=exc.message)
diff --git a/frontend/src/components/compose/ProjectDetails.vue b/frontend/src/components/compose/ProjectDetails.vue
@@ -127,7 +127,7 @@
           </v-col>
         </v-row>
       </v-card-title>
-      <v-card-subtitle v-if="action">Running compose {{ action }} ...</v-card-subtitle>
+      <v-card-subtitle v-if="action">Running docker-compose {{ action }} ...</v-card-subtitle>
     </v-card>
     <v-card color="foreground" class="mt-2">
       <v-card-title> Project Details </v-card-title>