1
0
mirror of https://github.com/containers/buildah.git synced 2026-02-05 18:44:58 +01:00

escape shell variables in README example

Signed-off-by: Pavel Raiskup <praiskup@redhat.com>

Closes: #1413
Approved by: TomSweeneyRedHat
This commit is contained in:
Pavel Raiskup
2019-03-18 07:18:02 +01:00
committed by Atomic Bot
parent a986f34af5
commit cfcfc46c8a
2 changed files with 14 additions and 14 deletions

View File

@@ -78,21 +78,21 @@ From [`./examples/lighttpd.sh`](examples/lighttpd.sh):
$ cat > lighttpd.sh <<"EOF"
#!/bin/bash -x
ctr1=`buildah from ${1:-fedora}`
ctr1=$(buildah from "${1:-fedora}")
## Get all updates and install our minimal httpd server
buildah run $ctr1 -- dnf update -y
buildah run $ctr1 -- dnf install -y lighttpd
buildah run "$ctr1" -- dnf update -y
buildah run "$ctr1" -- dnf install -y lighttpd
## Include some buildtime annotations
buildah config --annotation "com.example.build.host=$(uname -n)" $ctr1
buildah config --annotation "com.example.build.host=$(uname -n)" "$ctr1"
## Run our server and expose the port
buildah config --cmd "/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf" $ctr1
buildah config --port 80 $ctr1
buildah config --cmd "/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf" "$ctr1"
buildah config --port 80 "$ctr1"
## Commit this container to an image name
buildah commit $ctr1 ${2:-$USER/lighttpd}
buildah commit "$ctr1" "${2:-$USER/lighttpd}"
EOF
$ chmod +x lighttpd.sh

View File

@@ -1,17 +1,17 @@
#!/bin/bash -x
ctr1=`buildah from ${1:-fedora}`
ctr1=$(buildah from "${1:-fedora}")
## Get all updates and install our minimal httpd server
buildah run $ctr1 -- dnf update -y
buildah run $ctr1 -- dnf install -y lighttpd
buildah run "$ctr1" -- dnf update -y
buildah run "$ctr1" -- dnf install -y lighttpd
## Include some buildtime annotations
buildah config --annotation "com.example.build.host=$(uname -n)" $ctr1
buildah config --annotation "com.example.build.host=$(uname -n)" "$ctr1"
## Run our server and expose the port
buildah config --cmd "/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf" $ctr1
buildah config --port 80 $ctr1
buildah config --cmd "/usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf" "$ctr1"
buildah config --port 80 "$ctr1"
## Commit this container to an image name
buildah commit $ctr1 ${2:-$USER/lighttpd}
buildah commit "$ctr1" "${2:-$USER/lighttpd}"