Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove envs from docker-compose commands #256

Merged
merged 1 commit into from
Feb 6, 2021
Merged

remove envs from docker-compose commands #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions backend/api/actions/compose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand All @@ -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())
Expand Down
5 changes: 4 additions & 1 deletion backend/api/auth/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion frontend/src/components/compose/ProjectDetails.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down