Skip to content

Commit

Permalink
feat: Allow different named app.yamls (#8)
Browse files Browse the repository at this point in the history
  • Loading branch information
sveneberth authored Oct 30, 2024
1 parent c265469 commit 10f58b9
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/app_server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import logging
import mimetypes
import os
from pathlib import Path
import re
import subprocess
import sys
Expand Down Expand Up @@ -358,8 +359,9 @@ def main():
epilog=f"Version: {__version__}"
)

ap.add_argument("config_paths", metavar='yaml_path', nargs='+',
help='Path to app.yaml file')
ap.add_argument("distribution_folder", help="Path of the application")
ap.add_argument("--appyaml", default="app.yaml",
help="Path to app.yaml file (relative to the distribution_folder)")
ap.add_argument(
'-A', '--application', action='store', dest='app_id', required=True,
help='Set the application id')
Expand Down Expand Up @@ -405,10 +407,10 @@ def main():

args = ap.parse_args()

app_folder = os.path.abspath(args.config_paths[0])
app_folder = Path(args.distribution_folder)

# load & parse the app.yaml
with open(os.path.join(app_folder, "app.yaml"), "r") as f:
with open(app_folder / args.appyaml, "r") as f:
app_yaml = yaml.load(f, Loader=yaml.Loader)

set_env_vars(args.app_id, args, app_yaml)
Expand Down

0 comments on commit 10f58b9

Please sign in to comment.