Skip to content

Commit

Permalink
Merge branch 'add-waypoint' of https://github.com/pennlabs/infrastruc…
Browse files Browse the repository at this point in the history
…ture into add-waypoint
  • Loading branch information
joyliu-q committed Feb 13, 2025
2 parents f5e815b + 0f28eee commit cde0c81
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docker/waypoint/install.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

INSTALL_DIR="/usr/local/bin"
WAYPOINT_VERSION="v0.0.2.4"
WAYPOINT_VERSION="v0.0.2.5"
GITHUB_ORG="pennlabs"
REPO_NAME="infrastructure"

Expand Down
20 changes: 13 additions & 7 deletions docker/waypoint/src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,12 @@ def init_product(product: str) -> None:
shell=True,
check=True,
)
subprocess.run(
f"bash -c 'source {venv_path} && cd {backend_path} && python manage.py populate'",
shell=True,
check=True,
)
if (product != "penn-mobile"):
subprocess.run(
f"bash -c 'source {venv_path} && cd {backend_path} && python manage.py populate'",
shell=True,
check=True,
)
except subprocess.CalledProcessError:
print(
f"Failed to run manage.py commands for {product}, did you run `waypoint services`?"
Expand Down Expand Up @@ -320,6 +321,7 @@ def main() -> None:
You can also specify --no-vsc to not open VSCode.
Example: waypoint switch office-hours-queue --no-vsc
---------------------------------------------------------""",
)
switch_parser.add_argument(
Expand All @@ -337,6 +339,7 @@ def main() -> None:
Note: Must be in a dev container to run this command.
Example: waypoint start
----------------------------------------------------------------------------------------------------
""",
)
Expand All @@ -348,7 +351,8 @@ def main() -> None:
Runs `python manage.py runserver` in the appropriate directory.
Note: Must be in a dev container to run this command.
Example: waypoint backend
Example: waypoint backend
-------------------------------------------------------------
""",
)
Expand All @@ -359,7 +363,8 @@ def main() -> None:
Runs `yarn dev` in the appropriate directory.
Note: Must be in a dev container to run this command.
Example: waypoint frontend
Example: waypoint frontend
-------------------------------------------------------------
"""
)
Expand All @@ -372,6 +377,7 @@ def main() -> None:
If no mode is specified, it will start the services.
Example: waypoint services start
-------------------------------------------------------------
""",
)
Expand Down

0 comments on commit cde0c81

Please sign in to comment.