Revert "Merge branch 'main' into ROCKS-1124/parse-yaml-strings-as-str…

…ings"

This reverts commit a557f2e, reversing
changes made to bf9f5ee.

.github/PULL_REQUEST_TEMPLATE/trigger.md

@@ -11,4 +11,4 @@
 
 -----
 
-*Picture of a cool rock:*
+*Picture of a cool ROCK:*

.github/base_digests/20.04

@@ -1 +1 @@
-public.ecr.aws/ubuntu/ubuntu:focal@sha256:b42b0c7b64b50fb1e3edf1d21ff6b25c62b06f2fd8a6aa907bce4acb2127cec5
+public.ecr.aws/ubuntu/ubuntu:focal@sha256:04048909689a4cf8db9b033cd4532c4ca1961f115d67ca8b1008c2b21ef4f855

.github/base_digests/22.04

@@ -1,2 +1,2 @@
-public.ecr.aws/ubuntu/ubuntu:jammy@sha256:1cc4019c277242e5fb710f2cf40af1590ad053b7d764efba48b051871dcc18d8
+public.ecr.aws/ubuntu/ubuntu:jammy@sha256:e1bbf84dcabd0d43929359b5d2d6d635556b34fc9cf4b204f4f16ecf87fbe3a4
 

.github/workflows/Build-Rock.yaml

@@ -57,7 +57,7 @@ jobs:
           rock_name=`cat rockcraft.y*ml | yq -r .name`
           if [[ "${{ inputs.oci-factory-path }}" != *"${rock_name}"* ]]
           then
-            echo "ERROR: the rock's name '${rock_name}' must match the OCI folder name!"
+            echo "ERROR: the ROCK's name '${rock_name}' must match the OCI folder name!"
             exit 1
           fi
       - uses: actions/setup-python@v5
@@ -157,7 +157,7 @@ jobs:
             python3 ${rocks_toolbox}/rockcraft_lpci_build/rockcraft_lpci_build.py \
               --lp-credentials-b64 "${{ secrets.LP_CREDENTIALS_B64 }}" \
               --launchpad-accept-public-upload
-      - name: Rename rock OCI archive
+      - name: Rename ROCK OCI archive
         id: rock
         run: |
           mkdir ${{ env.ROCKS_CI_FOLDER }}

.github/workflows/Tests.yaml

@@ -156,7 +156,7 @@ jobs:
             copy oci:${{ env.TEST_IMAGE_NAME}}:${{ env.TEST_IMAGE_TAG }} \
             docker-daemon:${{ env.TEST_IMAGE_NAME}}:${{ env.TEST_IMAGE_TAG }}
       
-      - name: Test rock
+      - name: Test ROCK
         run: |
           set -ex
           docker run --rm ${{ env.TEST_IMAGE_NAME}}:${{ env.TEST_IMAGE_TAG }} \

IMAGE_MAINTAINER_AGREEMENT.md

@@ -30,7 +30,7 @@ registry namespace.
 |  |  |
 |---|---|
 | CI/CD | Continuous Integration and Continuous Deployment |
-| Maintainer | Canonical entity who owns and is responsible for an Ubuntu Rock/Image. |
+| Maintainer | Canonical entity who owns and is responsible for an Ubuntu ROCK/Image. |
 | OCI image | Currently limited to rock images only. |
 | Registry | An OCI container registry, as [defined](https://oras.land/#what-are-oci-registries) by the OCI specification. |
 | Rocks | Canonical’s OCI images, built via Rockcraft. See the definition [here](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/explanation.html#what-is-a-rock). |

README.md

@@ -2,7 +2,7 @@
 
 # Welcome to the OCI Factory! 👋
 
-*Behind every great rock is a great quarry...*
+*Behind every great ROCK is a great quarry...*
 </div>
 
 ## 🍿 **Before you get started**

oci/alertmanager/_releases.json

@@ -1,107 +1,107 @@
 {
     "0.25.0-22.04": {
         "stable": {
-            "target": "38"
+            "target": "35"
         },
         "candidate": {
-            "target": "38"
+            "target": "35"
         },
         "beta": {
-            "target": "38"
+            "target": "35"
         },
         "edge": {
-            "target": "38"
+            "target": "35"
         },
         "end-of-life": "2025-03-13T00:00:00Z"
     },
     "0.25-22.04": {
         "stable": {
-            "target": "38"
+            "target": "35"
         },
         "candidate": {
-            "target": "38"
+            "target": "35"
         },
         "beta": {
-            "target": "38"
+            "target": "35"
         },
         "edge": {
-            "target": "38"
+            "target": "35"
         },
         "end-of-life": "2025-03-13T00:00:00Z"
     },
     "0-22.04": {
         "stable": {
-            "target": "40"
+            "target": "37"
         },
         "candidate": {
-            "target": "40"
+            "target": "37"
         },
         "beta": {
-            "target": "40"
+            "target": "37"
         },
         "edge": {
-            "target": "40"
+            "target": "37"
         },
         "end-of-life": "2025-03-13T00:00:00Z"
     },
     "0.26.0-22.04": {
         "stable": {
-            "target": "39"
+            "target": "36"
         },
         "candidate": {
-            "target": "39"
+            "target": "36"
         },
         "beta": {
-            "target": "39"
+            "target": "36"
         },
         "edge": {
-            "target": "39"
+            "target": "36"
         },
         "end-of-life": "2025-03-13T00:00:00Z"
     },
     "0.26-22.04": {
         "stable": {
-            "target": "39"
+            "target": "36"
         },
         "candidate": {
-            "target": "39"
+            "target": "36"
         },
         "beta": {
-            "target": "39"
+            "target": "36"
         },
         "edge": {
-            "target": "39"
+            "target": "36"
         },
         "end-of-life": "2025-03-13T00:00:00Z"
     },
     "0.27.0-22.04": {
         "end-of-life": "2025-03-13T00:00:00Z",
         "stable": {
-            "target": "40"
+            "target": "37"
         },
         "candidate": {
-            "target": "40"
+            "target": "37"
         },
         "beta": {
-            "target": "40"
+            "target": "37"
         },
         "edge": {
-            "target": "40"
+            "target": "37"
         }
     },
     "0.27-22.04": {
         "end-of-life": "2025-03-13T00:00:00Z",
         "stable": {
-            "target": "40"
+            "target": "37"
         },
         "candidate": {
-            "target": "40"
+            "target": "37"
         },
         "beta": {
-            "target": "40"
+            "target": "37"
         },
         "edge": {
-            "target": "40"
+            "target": "37"
         }
     }
 }

oci/alertmanager/documentation.yaml

@@ -9,7 +9,7 @@ description: >
   silencing and inhibition of alerts.
   Read more on the [official documentation](https://prometheus.io/docs/alerting/latest/alertmanager/)
 
-  Please note that this repository is now holding a rock, not a
+  Please note that this repository is now holding a ROCK, not a
   Dockerfile-based image. As such the entrypoint is now Pebble. Read more on
   the [Rockcraft docs](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/).
 # --- USAGE INFORMATION ---

oci/charmed-opensearch/documentation.yaml

@@ -3,7 +3,7 @@ version: 1
 application: charmed-opensearch
 is_chiselled: False
 description: |
-  Charmed OpenSearch rock. OpenSearch is a community-driven, Apache 2.0-licensed open source 
+  Charmed OpenSearch ROCK OCI. OpenSearch is a community-driven, Apache 2.0-licensed open source 
   search and analytics suite that makes it easy to ingest, search, visualize, and analyze data. 
   Developers build with OpenSearch for use cases such as application search, 
   log analytics, data observability, data ingestion, and more.

oci/grafana/documentation.yaml

@@ -7,7 +7,7 @@ description: >
   Read more on the [Grafana website](https://grafana.com).
 
   Please note that the images tagged up to 8.2 are Dockerfile-based images,
-  whereas from version 10.0.3 onward the images are now rocks. As such the
+  whereas from version 10.0.3 onward the images are now ROCKs. As such the
   entrypoint is now Pebble. Read more on the
   [Rockcraft docs](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/explanation/rocks/).
 # --- USAGE INFORMATION ---
@@ -47,6 +47,6 @@ debug:
     ```bash
     # For Dockerfile-based images
     docker exec -it grafana-container /bin/bash
-    # For rocks
+    # For ROCKs
     docker exec -it grafana-container exec /bin/bash
     ```

oci/kafka/_releases.json

@@ -2,7 +2,7 @@
     "3.6-22.04": {
         "end-of-life": "2024-05-01T00:00:00Z",
         "edge": {
-            "target": "5"
+            "target": "4"
         }
     }
 }

oci/kafka/documentation.yaml

@@ -16,7 +16,7 @@ description: |
   to run properly.
   
   Please note that the images tagged up to 3.1 are Dockerfile-base images,
-  whereas from version 3.6.1 onward the images are now rocks. As such the
+  whereas from version 3.6.1 onward the images are now ROCKs. As such the
   entrypoint is now Pebble. Read more on the
   [Rockcraft docs](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/explanation/rocks/).
 
@@ -34,13 +34,17 @@ description: |
   Deploy the ZooKeeper service
   
   ```bash 
-  docker run --detach  --name zookeeper --network kafka-network ubuntu/zookeeper:3.8-22.04_edge
+  docker run --detach \
+    --network kafka-network --name zookeeper \
+    ubuntu/zookeeper:3.8-22.04_edge
   ```
   
   Finally, deploy the Kafka service
   
   ```
-  docker run --detach --name kafka --network kafka-network -p 9092:9092 ubuntu/kafka:3.6-22.04_edge
+  docker run --detach \
+    --name kafka --network kafka-network -p 9092:9092 \
+    kafka:3.6-22.04_edge
   ```
 
 # --- USAGE INFORMATION ---

oci/loki/documentation.yaml

@@ -9,7 +9,7 @@ description: >
   Read more on the [official website](https://grafana.com/oss/loki/).
   
   Please note that the images tagged up to 2.4 are Dockerfile-base images,
-  whereas from version 2.8.4 onward the images are now rocks. As such the
+  whereas from version 2.8.4 onward the images are now ROCKs. As such the
   entrypoint is now Pebble. Read more on the
   [Rockcraft docs](https://canonical-rockcraft.readthedocs-hosted.com/en/latest/explanation/rocks/).
 # --- USAGE INFORMATION ---
@@ -45,6 +45,6 @@ debug:
     ```bash
     # For Dockerfile-based images
     docker exec -it loki-container /bin/bash
-    # For rocks
+    # For ROCKs
     docker exec -it loki-container exec /bin/bash
     ```