Skip to content

Commit 62989dd

Browse files
committed
fix: pass -o tzdata=UTC to appjail oci run, bump 1.8.1
Remvoes ln -sf /etc/localtime workaround from the CI workflow Add successor support to README.mkdocs.j2
1 parent 58a106e commit 62989dd

5 files changed

Lines changed: 7 additions & 3 deletions

File tree

.github/workflows/daemonless-build.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ jobs:
121121
pkg update -f
122122
pkg install -y podman ${{ env.COMPOSE_PACKAGES }} jq skopeo buildah trivy python3 py311-pyyaml appjail
123123
mkdir -p /var/log/appjail/jails /usr/local/appjail/jails
124-
ln -sf /usr/share/zoneinfo/UTC /etc/localtime
125124
126125
# Install patched ocijail for .NET apps (mlock support)
127126
fetch -qo /tmp/ocijail.pkg "https://github.com/daemonless/freebsd-ports/releases/download/v0.4.0-patched/ocijail-0.4.0_3-${{ matrix.arch }}.pkg"

dbuild/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
"""dbuild: FreeBSD OCI container image build tool.
22
"""
33

4-
VERSION = "1.8.0"
4+
VERSION = "1.8.1"

dbuild/appjail.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ def oci_run(jail_name: str, image_ref: str, *, allow: list[str] | None = None) -
149149
try:
150150
cmd = ["appjail", "oci", "run", "-d",
151151
"-o", f"template={template_path}",
152+
"-o", "tzdata=UTC",
152153
f"containers-storage:{image_ref}", jail_name]
153154
_run(cmd, capture=False)
154155
finally:

dbuild/templates/README.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ podman run -d --name {{ name }} \
173173
> **Use [{{ deprecated.replacement }}](https://github.com/daemonless/{{ deprecated.replacement }}) instead.**
174174
{%- endif %}
175175
{%- if deprecated.successor %}
176-
176+
>
177177
> **Successor:** [{{ deprecated.successor }}]({{ deprecated.successor }})
178178
{%- endif %}
179179

dbuild/templates/README.mkdocs.j2

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
!!! tip "Use [{{ deprecated.replacement }}]({{ deprecated.replacement }}.md) instead"
2424
Migrate to **[{{ deprecated.replacement }}]({{ deprecated.replacement }}.md)**, which replaces this image.
2525

26+
{%- elif deprecated.successor %}
27+
!!! tip "Successor"
28+
See **[{{ deprecated.successor }}]({{ deprecated.successor }})** for an alternative.
29+
2630
{% endif -%}
2731
{% endif -%}
2832
{%- endblock %}

0 commit comments

Comments
 (0)