Skip to content

Commit 00ac675

Browse files
committed
Remove domain name from base-path for flatpak index
2.24 has domain compatibility, but only for the default domain and it doesn't modify the v2/ urls
1 parent 9a8e6f1 commit 00ac675

3 files changed

Lines changed: 3 additions & 10 deletions

File tree

CHANGES/+flatpak-domain-name.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

pulp_container/app/registry_api.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
determine_media_type,
8282
extract_data_from_signature,
8383
filter_resource,
84-
get_full_path,
8584
has_task_completed,
8685
validate_manifest,
8786
)
@@ -702,7 +701,7 @@ def get(self, request):
702701
if images:
703702
results.append(
704703
{
705-
"Name": get_full_path(distribution.base_path, distribution.pulp_domain),
704+
"Name": distribution.base_path,
706705
"Images": images,
707706
}
708707
)

pulp_container/tests/functional/api/test_flatpak.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,21 +66,16 @@ def test_flatpak_install(
6666
container_manifest_api,
6767
pulp_settings,
6868
bindings_cfg,
69-
full_path,
7069
):
7170
if not pulp_settings.FLATPAK_INDEX:
7271
pytest.skip("This test requires FLATPAK_INDEX to be enabled")
7372

7473
image_path1 = f"{REGISTRY_V2}/pulp/oci-net.fishsoup.busyboxplatform:latest"
7574
registry_client.pull(image_path1)
76-
local_registry.tag_and_push(
77-
image_path1, full_path("pulptest/oci-net.fishsoup.busyboxplatform") + ":latest"
78-
)
75+
local_registry.tag_and_push(image_path1, "pulptest/oci-net.fishsoup.busyboxplatform:latest")
7976
image_path2 = f"{REGISTRY_V2}/pulp/oci-net.fishsoup.hello:latest"
8077
registry_client.pull(image_path2)
81-
local_registry.tag_and_push(
82-
image_path2, full_path("pulptest/oci-net.fishsoup.hello") + ":latest"
83-
)
78+
local_registry.tag_and_push(image_path2, "pulptest/oci-net.fishsoup.hello:latest")
8479
namespace = container_namespace_api.list(name="pulptest").results[0]
8580
add_to_cleanup(container_namespace_api, namespace.pulp_href)
8681

0 commit comments

Comments
 (0)