docker-library
/
docs
mirror of https://github.com/docker-library/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update "hello-world" docs to be multiarch-aware

This commit is contained in:
Tianon Gravi 2017-06-30 23:37:59 -07:00
parent 4c1d14a1ee
commit 7c45aad1e8
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hello-world/update.sh
View File

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -Eeuo pipefail
image="${1:-hello-world}"
docker pull hello-world &> /dev/null docker pull hello-world &> /dev/null
docker pull "$image" &> /dev/null
exec > "$(dirname "$(readlink -f "$BASH_SOURCE")")/content.md" exec > "$(dirname "$(readlink -f "$BASH_SOURCE")")/content.md"
@ -9,11 +12,11 @@ echo '# Example output'
echo echo
echo '```console' echo '```console'
echo '$ docker run hello-world' echo '$ docker run' "$image"
docker run --rm hello-world docker run --rm hello-world
echo echo
echo '$ docker images hello-world' echo '$ docker images' "$image"
docker images hello-world | awk -F' +' 'NR == 1 || $2 == "latest" { print $1"\t"$2"\t"$3"\t"$5 }' | column -t -s$'\t' docker images "$image" | awk -F' +' 'NR == 1 || $2 == "latest" { print $1"\t"$2"\t"$3"\t"$5 }' | column -t -s$'\t'
echo '```' echo '```'
echo echo

2
update.sh
View File

@ -26,7 +26,7 @@ for image in "${images[@]}"; do
namespace="${namespace%/}" namespace="${namespace%/}"
if [ -x "$repo/update.sh" ]; then if [ -x "$repo/update.sh" ]; then
( set -x; "$repo/update.sh" ) ( set -x; "$repo/update.sh" "$image" )
fi fi
if [ -e "$repo/content.md" ]; then if [ -e "$repo/content.md" ]; then