Skip to content

Commit

Permalink
docs: update link to Pebble layer specification (#779)
Browse files Browse the repository at this point in the history
As of a few months ago we have a proper docs site and the README is minimal, so update this link.

---------

Co-authored-by: Tiago Nobrega <[email protected]>
  • Loading branch information
benhoyt and tigarmo authored Dec 20, 2024
1 parent 41b2368 commit f5532ef
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
linkcheck_ignore = [
"http://0.0.0.0:8080",
"https://github.com/canonical/craft-actions#rockcraft-pack",
"https://github.com/canonical/pebble#layer-specification",
"https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/",
"https://juju.is/cloud-native-kubernetes-usage-report-2021#selection-criteria-for-container-images",
"https://matrix.to/#/#rocks:ubuntu.com",
# Ignore changelog links to Rockcraft releases, because the changelog entries
Expand Down
2 changes: 1 addition & 1 deletion docs/explanation/pebble.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ convert a Docker entrypoint to a Pebble layer.
.. _tini: https://github.com/krallin/tini
.. _s6-overlay: https://github.com/just-containers/s6-overlay
.. _imperative wrapper scripts (as suggested in the Docker documentation): https://docs.docker.com/engine/containers/multi-service_container/#use-a-wrapper-script
.. _Pebble layer specification: https://github.com/canonical/pebble#layer-specification
.. _Pebble layer specification: https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/
3 changes: 2 additions & 1 deletion docs/how-to/rocks/convert-to-pebble-layer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ Design the Pebble services
--------------------------

A `Pebble layer
<https://github.com/canonical/pebble#layer-specification>`_
<https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/
layer-specification/>`_
is composed of metadata, checks and services. The latter is present in
``rockcraft.yaml`` as a `top-level field
<https://canonical-rockcraft.readthedocs-hosted.com/en/latest/reference/
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/rockcraft.yaml.rst
Original file line number Diff line number Diff line change
Expand Up @@ -274,4 +274,4 @@ Example
:language: yaml


.. _`Pebble Layer Specification format`: https://github.com/canonical/pebble#layer-specification
.. _`Pebble Layer Specification format`: https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/
4 changes: 2 additions & 2 deletions rockcraft/pebble.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Check(CraftBaseModel):
"""Lightweight schema validation for a Pebble checks.
Based on
https://github.com/canonical/pebble#layer-specification
https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/
"""

override: Literal["merge", "replace"]
Expand Down Expand Up @@ -98,7 +98,7 @@ class Service(CraftBaseModel):
"""Lightweight schema validation for a Pebble service.
Based on
https://github.com/canonical/pebble#layer-specification
https://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/
"""

override: Literal["merge", "replace"]
Expand Down
4 changes: 2 additions & 2 deletions schema/rockcraft.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"$defs": {
"Check": {
"additionalProperties": false,
"description": "Lightweight schema validation for a Pebble checks.\n\nBased on\nhttps://github.com/canonical/pebble#layer-specification",
"description": "Lightweight schema validation for a Pebble checks.\n\nBased on\nhttps://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/",
"properties": {
"override": {
"enum": [
Expand Down Expand Up @@ -286,7 +286,7 @@
},
"Service": {
"additionalProperties": false,
"description": "Lightweight schema validation for a Pebble service.\n\nBased on\nhttps://github.com/canonical/pebble#layer-specification",
"description": "Lightweight schema validation for a Pebble service.\n\nBased on\nhttps://canonical-pebble.readthedocs-hosted.com/en/latest/reference/layer-specification/",
"properties": {
"override": {
"enum": [
Expand Down

0 comments on commit f5532ef

Please sign in to comment.