Skip to content

Commit 25a5b1f

Browse files
committed
Switch to use systemd-tmpfiles for registry on TW
1 parent 71e7713 commit 25a5b1f

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

src/bci_build/package/registry.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"""Application Containers for Docker/OCI Distribution registry"""
22

3-
43
from bci_build.container_attributes import TCP
54
from bci_build.container_attributes import SupportLevel
65
from bci_build.os_version import ALL_NONBASE_OS_VERSIONS
@@ -11,6 +10,7 @@
1110
from bci_build.package import ApplicationStackContainer
1211
from bci_build.package.helpers import generate_from_image_tag
1312
from bci_build.package.helpers import generate_package_version_check
13+
from bci_build.package.helpers import generate_systemd_tmpfiles_command
1414
from bci_build.package.versions import format_version
1515
from bci_build.package.versions import get_pkg_version
1616
from bci_build.replacement import Replacement
@@ -57,10 +57,17 @@
5757
build_stage_custom_end=generate_package_version_check(
5858
"distribution-registry", distribution_version, use_target=True
5959
)
60+
+ (
61+
generate_systemd_tmpfiles_command(
62+
"distribution-registry.conf", use_target=True
63+
)
64+
if os_version.is_tumbleweed
65+
else ""
66+
)
6067
+ (f"\n{SET_BLKID_SCAN}\n" if os_version.is_sle15 else ""),
6168
custom_end=(
6269
f"{DOCKERFILE_RUN} install -d -m 0755 -o registry -g registry /var/lib/docker-registry\n"
63-
if not os_version.is_sle15
70+
if os_version.is_sle16
6471
else ""
6572
)
6673
+ ("COPY --from=builder /etc/blkid.conf /etc\n" if os_version.is_sle15 else ""),

0 commit comments

Comments
 (0)