Skip to content

Fixed issue where containerapp up would not honor --registry-server. #127

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

Closed
runefa wants to merge 2 commits into from
Closed

Fixed issue where containerapp up would not honor --registry-server. #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ee42d3
Fixed issue where containerapp up would not honor --registry-server.
Jun 7, 2022
df1bb4f
Use constant.
Jun 8, 2022
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
27 changes: 11 additions & 16 deletions src/containerapp/azext_containerapp/_up_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,24 +592,19 @@ def _get_acr_from_image(cmd, app):
)


def _get_registry_from_app(app):
def _get_registry_from_app(app, source):
containerapp_def = app.get()
existing_registries = safe_get(containerapp_def, "properties", "configuration", "registries", default=[])
if source:
existing_registries = [r for r in existing_registries if ACR_IMAGE_SUFFIX in r["server"]]
if containerapp_def:
if (
len(
safe_get(
containerapp_def,
"properties",
"configuration",
"registries",
default=[],
)
)
== 1
):
app.registry_server = containerapp_def["properties"]["configuration"][
"registries"
][0]["server"]
if len(existing_registries) == 1:
app.registry_server = existing_registries[0]["server"]
elif len(existing_registries) > 1: # default to registry in image if possible, otherwise don't infer
containers = safe_get(containerapp_def, "properties", "template", "containers", default=[])
image_server = next(c["image"] for c in containers if c["name"].lower() == app.name.lower()).split('/')[0]
if image_server in [r["server"] for r in existing_registries]:
app.registry_server = image_server


def _get_acr_rg(app):
Expand Down
3 changes: 2 additions & 1 deletion src/containerapp/azext_containerapp/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2234,7 +2234,8 @@ def containerapp_up(cmd,
env.create_if_needed(name)

if source or repo:
_get_registry_from_app(app) # if the app exists, get the registry
if not registry_server:
_get_registry_from_app(app, source) # if the app exists, get the registry
_get_registry_details(cmd, app, source) # fetch ACR creds from arguments registry arguments

app.create_acr_if_needed()
Expand Down