Skip to content

Commit bb422c8

Browse files
committed
Revert "Change the syntax to not depend on jinja2."
This reverts commit 9de737b. Signed-off-by: Paul Holzinger <[email protected]>
1 parent fd60d63 commit bb422c8

File tree

105 files changed

+575
-574
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+575
-574
lines changed

docs/source/markdown/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,4 @@ podman-kube.unit.5.md
7676
podman-network.unit.5.md
7777
podman-pod.unit.5.md
7878
podman-volume.unit.5.md
79+

docs/source/markdown/links/podman-systemd.unit.5

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

docs/source/markdown/options/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ option. To reduce the duplication, the Jinja2 templating system can be
3535
used to define parts which should be rendered only in Quadlet man-pages:
3636

3737
```
38-
<< if is_quadlet >>
38+
{% if is_quadlet %}
3939
### `DNS=`
40-
<< else >>
40+
{% else %}
4141
#### **--dns**=*ipaddr*
42-
<< endif >>
42+
{% endif %}
4343
```
4444

4545
It is also possible to use in-line condition:
4646

4747
```
48-
<< '**DNS=.**' if is_quadlet else '**--dns**' >>
48+
{{{ '**DNS=.**' if is_quadlet else '**--dns**' }}}
4949
```
5050

5151
Following variables are available for Jinja2 Templates:

docs/source/markdown/options/add-host.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman build, podman-container.unit.5.md.in, create, farm build, pod create, podman-pod.unit.5.md.in, run
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `AddHost=hostname[;hostname[;...]]:ip`
7-
<< else >>
7+
{% else %}
88
#### **--add-host**=*hostname[;hostname[;...]]*:*ip*
9-
<< endif >>
9+
{% endif %}
1010

1111
Add a custom host-to-IP mapping to the <<container|pod>>'s `/etc/hosts` file.
1212

docs/source/markdown/options/annotation.container.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
####> podman podman-container.unit.5.md.in, create, kube play, run
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `Annotation=key=value`
7-
<< else >>
7+
{% else %}
88
#### **--annotation**=*key=value*
9-
<< endif >>
9+
{% endif %}
1010

1111
Add an annotation to the container<<| or pod>>. This option can be set multiple times.

docs/source/markdown/options/annotation.image.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman build, farm build
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `Annotation=annotation=value`
7-
<< else >>
7+
{% else %}
88
#### **--annotation**=*annotation=value*
9-
<< endif >>
9+
{% endif %}
1010

1111
Add an image *annotation* (e.g. annotation=*value*) to the image metadata. Can
1212
be used multiple times.

docs/source/markdown/options/arch.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman podman-build.unit.5.md.in, create, podman-image.unit.5.md.in, pull, run
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `Arch=ARCH`
7-
<< else >>
7+
{% else %}
88
#### **--arch**=*ARCH*
9-
<< endif >>
9+
{% endif %}
1010

1111
Override the architecture, defaults to hosts, of the image to be pulled. For example, `arm`.
1212
Unless overridden, subsequent lookups of the same image in the local storage matches this architecture, regardless of the host.

docs/source/markdown/options/authfile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman artifact pull, artifact push, auto update, build, podman-build.unit.5.md.in, container runlabel, create, farm build, image sign, podman-image.unit.5.md.in, kube play, login, logout, manifest add, manifest inspect, manifest push, pull, push, run, search
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `AuthFile=path`
7-
<< else >>
7+
{% else %}
88
#### **--authfile**=*path*
9-
<< endif >>
9+
{% endif %}
1010

1111
Path of the authentication file. Default is `${XDG_RUNTIME_DIR}/containers/auth.json` on Linux, and `$HOME/.config/containers/auth.json` on Windows/macOS.
1212
The file is created by **[podman login](podman-login.1.md)**. If the authorization state is not found there, `$HOME/.docker/config.json` is checked, which is set using **docker login**.

docs/source/markdown/options/cap-add.image.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman build, farm build
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `AddCapability=CAP_xxx`
7-
<< else >>
7+
{% else %}
88
#### **--cap-add**=*CAP\_xxx*
9-
<< endif >>
9+
{% endif %}
1010

1111

1212
When executing RUN instructions, run the command specified in the instruction

docs/source/markdown/options/cap-add.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
####> podman podman-container.unit.5.md.in, create, run
33
####> If file is edited, make sure the changes
44
####> are applicable to all of those.
5-
<< if is_quadlet >>
5+
{% if is_quadlet %}
66
### `AddCapability=capability`
7-
<< else >>
7+
{% else %}
88
#### **--cap-add**=*capability*
9-
<< endif >>
9+
{% endif %}
1010

1111
Add Linux capabilities.
1212

0 commit comments

Comments
 (0)