Update build/secrets examples

Author: shanejbrown

README.rst

@@ -359,7 +359,6 @@ shows the different configuration options available:
           # Example of a secret that is an environment variable
           - id=secret2,env=<environment variable name>
 
-
 .. _Build Secrets:
 
 Build Secrets
@@ -401,12 +400,6 @@ In order to use secrets in buildrunner, you need to do the following:
           # Example of a secret that is an environment variable
           - id=secret2,env=SECRET2
 
-
-
-
-
-
-
 .. _Running Containers:
 
 Running Containers (the ``run`` step attribute)

examples/build/secrets/buildrunner.yaml

@@ -7,13 +7,19 @@ use-legacy-builder: false
 steps:
   simple-build-step:
     build:
+      no-cache: true
       dockerfile: |
         FROM alpine:latest
+        # Using secrets inline
+        RUN --mount=type=secret,id=secret1 \
+            --mount=type=secret,id=secret2 \
+            echo "Using secrets in my build - secret1 file located at /run/secrets/secret1 with contents $(cat /run/secrets/secret1) and secret2=$(cat /run/secrets/secret2)"
+        # Using secrets in environment variables
         RUN --mount=type=secret,id=secret1 \
             --mount=type=secret,id=secret2 \
             SECRET1_FILE=/run/secrets/secret1 \
             SECRET2_VARIABLE=$(cat /run/secrets/secret2) \
-            echo "Using secrets in my build - secret1: $(cat $SECRET1_FILE) secret2: $SECRET2_VARIABLE"
+            && echo "Using secrets in my build - secret1 file located at $SECRET1_FILE with contents $(cat $SECRET1_FILE) and secret2=$SECRET2_VARIABLE"
       secrets:
         # Example of a secret that is a file
         - id=secret1,src=examples/build/secrets/secret1.txt

examples/build/secrets/platforms-buildrunner.yaml

@@ -2,18 +2,23 @@
 # add platforms to the build section
 # To run this example, you need to set the SECRET_PASSWORD environment variable
 # and run the example with the following command:
-# SECRET2=my_secret ./run-buildrunner.sh -f examples/build/secrets/buildrunner-platforms.yaml
+# SECRET2=my_secret ./run-buildrunner.sh -f examples/build/secrets/platforms-buildrunner.yaml
 # More info about secrets: https://docs.docker.com/build/building/secrets/
 steps:
   simple-build-step:
     build:
       dockerfile: |
         FROM alpine:latest
+        # Using secrets inline
+        RUN --mount=type=secret,id=secret1 \
+            --mount=type=secret,id=secret2 \
+            echo "Using secrets in my build - secret1 file located at /run/secrets/secret1 with contents $(cat /run/secrets/secret1) and secret2=$(cat /run/secrets/secret2)"
+        # Using secrets in environment variables
         RUN --mount=type=secret,id=secret1 \
             --mount=type=secret,id=secret2 \
             SECRET1_FILE=/run/secrets/secret1 \
             SECRET2_VARIABLE=$(cat /run/secrets/secret2) \
-            echo "Using secrets in my build - secret1: $(cat $SECRET1_FILE) secret2: $SECRET2_VARIABLE"
+            && echo "Using secrets in my build - secret1 file located at $SECRET1_FILE with contents $(cat $SECRET1_FILE) and secret2=$SECRET2_VARIABLE"
       secrets:
         # Example of a secret that is a file
         - id=secret1,src=examples/build/secrets/secret1.txt