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

hack: quote all parameters with variable interpolation 

better safe then sorry. especially for rm

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
This commit is contained in:
Jörg Thalheim 2015-04-14 18:08:08 +02:00
parent 23afce5f7f
commit ac20568b0a
9 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hack/dind
View File

@ -60,7 +60,7 @@ for HIER in $(cut -d: -f2 /proc/1/cgroup); do
mkdir -p "$CGROUP/$HIER" mkdir -p "$CGROUP/$HIER"
if ! mountpoint -q $CGROUP/$HIER; then if ! mountpoint -q "$CGROUP/$HIER"; then
mount -n -t cgroup -o "$OHIER" cgroup "$CGROUP/$HIER" mount -n -t cgroup -o "$OHIER" cgroup "$CGROUP/$HIER"
fi fi

8
hack/make.sh
View File

@ -252,7 +252,7 @@ bundle() {
bundlescript=$1 bundlescript=$1
bundle=$(basename $bundlescript) bundle=$(basename $bundlescript)
echo "---> Making bundle: $bundle (in bundles/$VERSION/$bundle)" echo "---> Making bundle: $bundle (in bundles/$VERSION/$bundle)"
mkdir -p bundles/$VERSION/$bundle mkdir -p "bundles/$VERSION/$bundle"
source "$bundlescript" "$(pwd)/bundles/$VERSION/$bundle" source "$bundlescript" "$(pwd)/bundles/$VERSION/$bundle"
} }
@ -262,13 +262,13 @@ main() {
mkdir -p bundles mkdir -p bundles
if [ -e "bundles/$VERSION" ]; then if [ -e "bundles/$VERSION" ]; then
echo "bundles/$VERSION already exists. Removing." echo "bundles/$VERSION already exists. Removing."
rm -fr bundles/$VERSION && mkdir bundles/$VERSION || exit 1 rm -fr "bundles/$VERSION" && mkdir "bundles/$VERSION" || exit 1
echo echo
fi fi
if [ "$(go env GOHOSTOS)" != 'windows' ]; then if [ "$(go env GOHOSTOS)" != 'windows' ]; then
# Windows and symlinks don't get along well # Windows and symlinks don't get along well
ln -sfT $VERSION bundles/latest ln -sfT "$VERSION" bundles/latest
fi fi
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
@ -277,7 +277,7 @@ main() {
bundles=($@) bundles=($@)
fi fi
for bundle in ${bundles[@]}; do for bundle in ${bundles[@]}; do
bundle $SCRIPTDIR/make/$bundle bundle "$SCRIPTDIR/make/$bundle"
echo echo
done done
} }

2
hack/make/.dockerinit
View File

@ -30,4 +30,4 @@ else
fi fi
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another # sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
export DOCKER_INITSHA1="$($sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)" export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)

2
hack/make/.dockerinit-gccgo
View File

@ -27,4 +27,4 @@ else
fi fi
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another # sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
export DOCKER_INITSHA1="$($sha1sum $DEST/dockerinit-$VERSION | cut -d' ' -f1)" export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)

4
hack/make/.integration-daemon-stop
View File

@ -2,8 +2,8 @@
for pidFile in $(find "$DEST" -name docker.pid); do for pidFile in $(find "$DEST" -name docker.pid); do
pid=$(set -x; cat "$pidFile") pid=$(set -x; cat "$pidFile")
( set -x; kill $pid ) ( set -x; kill "$pid" )
if ! wait $pid; then if ! wait "$pid"; then
echo >&2 "warning: PID $pid from $pidFile had a nonzero exit code" echo >&2 "warning: PID $pid from $pidFile had a nonzero exit code"
fi fi
done done

2
hack/make/test-integration
View File

@ -22,4 +22,4 @@ bundle_test_integration() {
# spews when it is given packages that aren't used # spews when it is given packages that aren't used
bundle_test_integration 2>&1 \ bundle_test_integration 2>&1 \
| grep --line-buffered -v '^warning: no packages being tested depend on ' \ | grep --line-buffered -v '^warning: no packages being tested depend on ' \
| tee -a $DEST/test.log | tee -a "$DEST/test.log"

2
hack/make/test-unit
View File

@ -85,4 +85,4 @@ go_run_test_dir() {
fi fi
} }
bundle_test_unit 2>&1 | tee -a $DEST/test.log bundle_test_unit 2>&1 | tee -a "$DEST/test.log"

60
hack/make/ubuntu
View File

@ -40,26 +40,26 @@ bundle_ubuntu() {
DIR=$DEST/build DIR=$DEST/build
# Include our udev rules # Include our udev rules
mkdir -p $DIR/etc/udev/rules.d mkdir -p "$DIR/etc/udev/rules.d"
cp contrib/udev/80-docker.rules $DIR/etc/udev/rules.d/ cp contrib/udev/80-docker.rules "$DIR/etc/udev/rules.d/"
# Include our init scripts # Include our init scripts
mkdir -p $DIR/etc/init mkdir -p "$DIR/etc/init"
cp contrib/init/upstart/docker.conf $DIR/etc/init/ cp contrib/init/upstart/docker.conf "$DIR/etc/init/"
mkdir -p $DIR/etc/init.d mkdir -p "$DIR/etc/init.d"
cp contrib/init/sysvinit-debian/docker $DIR/etc/init.d/ cp contrib/init/sysvinit-debian/docker "$DIR/etc/init.d/"
mkdir -p $DIR/etc/default mkdir -p "$DIR/etc/default"
cp contrib/init/sysvinit-debian/docker.default $DIR/etc/default/docker cp contrib/init/sysvinit-debian/docker.default "$DIR/etc/default/docker"
mkdir -p $DIR/lib/systemd/system mkdir -p "$DIR/lib/systemd/system"
cp contrib/init/systemd/docker.{service,socket} $DIR/lib/systemd/system/ cp contrib/init/systemd/docker.{service,socket} "$DIR/lib/systemd/system/"
# Include contributed completions # Include contributed completions
mkdir -p $DIR/etc/bash_completion.d mkdir -p "$DIR/etc/bash_completion.d"
cp contrib/completion/bash/docker $DIR/etc/bash_completion.d/ cp contrib/completion/bash/docker "$DIR/etc/bash_completion.d/"
mkdir -p $DIR/usr/share/zsh/vendor-completions mkdir -p "$DIR/usr/share/zsh/vendor-completions"
cp contrib/completion/zsh/_docker $DIR/usr/share/zsh/vendor-completions/ cp contrib/completion/zsh/_docker "$DIR/usr/share/zsh/vendor-completions/"
mkdir -p $DIR/etc/fish/completions mkdir -p "$DIR/etc/fish/completions"
cp contrib/completion/fish/docker.fish $DIR/etc/fish/completions/ cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
# Include contributed man pages # Include contributed man pages
docs/man/md2man-all.sh -q docs/man/md2man-all.sh -q
@ -76,11 +76,11 @@ bundle_ubuntu() {
# Copy the binary # Copy the binary
# This will fail if the binary bundle hasn't been built # This will fail if the binary bundle hasn't been built
mkdir -p $DIR/usr/bin mkdir -p "$DIR/usr/bin"
cp $DEST/../binary/docker-$VERSION $DIR/usr/bin/docker cp "$DEST/../binary/docker-$VERSION" "$DIR/usr/bin/docker"
# Generate postinst/prerm/postrm scripts # Generate postinst/prerm/postrm scripts
cat > $DEST/postinst <<'EOF' cat > "$DEST/postinst" <<'EOF'
#!/bin/sh #!/bin/sh
set -e set -e
set -u set -u
@ -104,7 +104,7 @@ service docker $_dh_action 2>/dev/null || true
#DEBHELPER# #DEBHELPER#
EOF EOF
cat > $DEST/prerm <<'EOF' cat > "$DEST/prerm" <<'EOF'
#!/bin/sh #!/bin/sh
set -e set -e
set -u set -u
@ -113,7 +113,7 @@ service docker stop 2>/dev/null || true
#DEBHELPER# #DEBHELPER#
EOF EOF
cat > $DEST/postrm <<'EOF' cat > "$DEST/postrm" <<'EOF'
#!/bin/sh #!/bin/sh
set -e set -e
set -u set -u
@ -131,18 +131,18 @@ fi
#DEBHELPER# #DEBHELPER#
EOF EOF
# TODO swaths of these were borrowed from debhelper's auto-inserted stuff, because we're still using fpm - we need to use debhelper instead, and somehow reconcile Ubuntu that way # TODO swaths of these were borrowed from debhelper's auto-inserted stuff, because we're still using fpm - we need to use debhelper instead, and somehow reconcile Ubuntu that way
chmod +x $DEST/postinst $DEST/prerm $DEST/postrm chmod +x "$DEST/postinst" "$DEST/prerm" "$DEST/postrm"
( (
# switch directories so we create *.deb in the right folder # switch directories so we create *.deb in the right folder
cd $DEST cd "$DEST"
# create lxc-docker-VERSION package # create lxc-docker-VERSION package
fpm -s dir -C $DIR \ fpm -s dir -C "$DIR" \
--name lxc-docker-$VERSION --version "$PKGVERSION" \ --name "lxc-docker-$VERSION" --version "$PKGVERSION" \
--after-install $DEST/postinst \ --after-install "$DEST/postinst" \
--before-remove $DEST/prerm \ --before-remove "$DEST/prerm" \
--after-remove $DEST/postrm \ --after-remove "$DEST/postrm" \
--architecture "$PACKAGE_ARCHITECTURE" \ --architecture "$PACKAGE_ARCHITECTURE" \
--prefix / \ --prefix / \
--depends iptables \ --depends iptables \
@ -184,8 +184,8 @@ EOF
) )
# clean up after ourselves so we have a clean output directory # clean up after ourselves so we have a clean output directory
rm $DEST/postinst $DEST/prerm $DEST/postrm rm "$DEST/postinst" "$DEST/prerm" "$DEST/postrm"
rm -r $DIR rm -r "$DIR"
} }
bundle_ubuntu bundle_ubuntu

52
hack/release.sh
View File

@ -71,23 +71,23 @@ BUCKET=$AWS_S3_BUCKET
setup_s3() { setup_s3() {
# Try creating the bucket. Ignore errors (it might already exist). # Try creating the bucket. Ignore errors (it might already exist).
s3cmd mb s3://$BUCKET 2>/dev/null || true s3cmd mb "s3://$BUCKET" 2>/dev/null || true
# Check access to the bucket. # Check access to the bucket.
# s3cmd has no useful exit status, so we cannot check that. # s3cmd has no useful exit status, so we cannot check that.
# Instead, we check if it outputs anything on standard output. # Instead, we check if it outputs anything on standard output.
# (When there are problems, it uses standard error instead.) # (When there are problems, it uses standard error instead.)
s3cmd info s3://$BUCKET | grep -q . s3cmd info "s3://$BUCKET" | grep -q .
# Make the bucket accessible through website endpoints. # Make the bucket accessible through website endpoints.
s3cmd ws-create --ws-index index --ws-error error s3://$BUCKET s3cmd ws-create --ws-index index --ws-error error "s3://$BUCKET"
} }
# write_to_s3 uploads the contents of standard input to the specified S3 url. # write_to_s3 uploads the contents of standard input to the specified S3 url.
write_to_s3() { write_to_s3() {
DEST=$1 DEST=$1
F=`mktemp` F=`mktemp`
cat > $F cat > "$F"
s3cmd --acl-public --mime-type='text/plain' put $F $DEST s3cmd --acl-public --mime-type='text/plain' put "$F" "$DEST"
rm -f $F rm -f "$F"
} }
s3_url() { s3_url() {
@ -246,20 +246,20 @@ release_build() {
# 1. A full APT repository is published at $BUCKET/ubuntu/ # 1. A full APT repository is published at $BUCKET/ubuntu/
# 2. Instructions for using the APT repository are uploaded at $BUCKET/ubuntu/index # 2. Instructions for using the APT repository are uploaded at $BUCKET/ubuntu/index
release_ubuntu() { release_ubuntu() {
[ -e bundles/$VERSION/ubuntu ] || { [ -e "bundles/$VERSION/ubuntu" ] || {
echo >&2 './hack/make.sh must be run before release_ubuntu' echo >&2 './hack/make.sh must be run before release_ubuntu'
exit 1 exit 1
} }
# Sign our packages # Sign our packages
dpkg-sig -g "--passphrase $GPG_PASSPHRASE" -k releasedocker \ dpkg-sig -g "--passphrase $GPG_PASSPHRASE" -k releasedocker \
--sign builder bundles/$VERSION/ubuntu/*.deb --sign builder "bundles/$VERSION/ubuntu/"*.deb
# Setup the APT repo # Setup the APT repo
APTDIR=bundles/$VERSION/ubuntu/apt APTDIR=bundles/$VERSION/ubuntu/apt
mkdir -p $APTDIR/conf $APTDIR/db mkdir -p "$APTDIR/conf" "$APTDIR/db"
s3cmd sync s3://$BUCKET/ubuntu/db/ $APTDIR/db/ || true s3cmd sync "s3://$BUCKET/ubuntu/db/" "$APTDIR/db/" || true
cat > $APTDIR/conf/distributions <<EOF cat > "$APTDIR/conf/distributions" <<EOF
Codename: docker Codename: docker
Components: main Components: main
Architectures: amd64 i386 Architectures: amd64 i386
@ -267,19 +267,19 @@ EOF
# Add the DEB package to the APT repo # Add the DEB package to the APT repo
DEBFILE=bundles/$VERSION/ubuntu/lxc-docker*.deb DEBFILE=bundles/$VERSION/ubuntu/lxc-docker*.deb
reprepro -b $APTDIR includedeb docker $DEBFILE reprepro -b "$APTDIR" includedeb docker "$DEBFILE"
# Sign # Sign
for F in $(find $APTDIR -name Release); do for F in $(find $APTDIR -name Release); do
gpg -u releasedocker --passphrase $GPG_PASSPHRASE \ gpg -u releasedocker --passphrase "$GPG_PASSPHRASE" \
--armor --sign --detach-sign \ --armor --sign --detach-sign \
--output $F.gpg $F --output "$F.gpg" "$F"
done done
# Upload keys # Upload keys
s3cmd sync $HOME/.gnupg/ s3://$BUCKET/ubuntu/.gnupg/ s3cmd sync "$HOME/.gnupg/" "s3://$BUCKET/ubuntu/.gnupg/"
gpg --armor --export releasedocker > bundles/$VERSION/ubuntu/gpg gpg --armor --export releasedocker > "bundles/$VERSION/ubuntu/gpg"
s3cmd --acl-public put bundles/$VERSION/ubuntu/gpg s3://$BUCKET/gpg s3cmd --acl-public put "bundles/$VERSION/ubuntu/gpg" "s3://$BUCKET/gpg"
local gpgFingerprint=36A1D7869245C8950F966E92D8576A8BA88D21E9 local gpgFingerprint=36A1D7869245C8950F966E92D8576A8BA88D21E9
if [[ $BUCKET == test* ]]; then if [[ $BUCKET == test* ]]; then
@ -287,7 +287,7 @@ EOF
fi fi
# Upload repo # Upload repo
s3cmd --acl-public sync $APTDIR/ s3://$BUCKET/ubuntu/ s3cmd --acl-public sync "$APTDIR/" "s3://$BUCKET/ubuntu/"
cat <<EOF | write_to_s3 s3://$BUCKET/ubuntu/index cat <<EOF | write_to_s3 s3://$BUCKET/ubuntu/index
# Check that HTTPS transport is available to APT # Check that HTTPS transport is available to APT
if [ ! -e /usr/lib/apt/methods/https ]; then if [ ! -e /usr/lib/apt/methods/https ]; then
@ -312,14 +312,14 @@ EOF
# Add redirect at /ubuntu/info for URL-backwards-compatibility # Add redirect at /ubuntu/info for URL-backwards-compatibility
rm -rf /tmp/emptyfile && touch /tmp/emptyfile rm -rf /tmp/emptyfile && touch /tmp/emptyfile
s3cmd --acl-public --add-header='x-amz-website-redirect-location:/ubuntu/' --mime-type='text/plain' put /tmp/emptyfile s3://$BUCKET/ubuntu/info s3cmd --acl-public --add-header='x-amz-website-redirect-location:/ubuntu/' --mime-type='text/plain' put /tmp/emptyfile "s3://$BUCKET/ubuntu/info"
echo "APT repository uploaded. Instructions available at $(s3_url)/ubuntu" echo "APT repository uploaded. Instructions available at $(s3_url)/ubuntu"
} }
# Upload binaries and tgz files to S3 # Upload binaries and tgz files to S3
release_binaries() { release_binaries() {
[ -e bundles/$VERSION/cross/linux/amd64/docker-$VERSION ] || { [ -e "bundles/$VERSION/cross/linux/amd64/docker-$VERSION" ] || {
echo >&2 './hack/make.sh must be run before release_binaries' echo >&2 './hack/make.sh must be run before release_binaries'
exit 1 exit 1
} }
@ -341,29 +341,29 @@ EOF
# Add redirect at /builds/info for URL-backwards-compatibility # Add redirect at /builds/info for URL-backwards-compatibility
rm -rf /tmp/emptyfile && touch /tmp/emptyfile rm -rf /tmp/emptyfile && touch /tmp/emptyfile
s3cmd --acl-public --add-header='x-amz-website-redirect-location:/builds/' --mime-type='text/plain' put /tmp/emptyfile s3://$BUCKET/builds/info s3cmd --acl-public --add-header='x-amz-website-redirect-location:/builds/' --mime-type='text/plain' put /tmp/emptyfile "s3://$BUCKET/builds/info"
if [ -z "$NOLATEST" ]; then if [ -z "$NOLATEST" ]; then
echo "Advertising $VERSION on $BUCKET as most recent version" echo "Advertising $VERSION on $BUCKET as most recent version"
echo $VERSION | write_to_s3 s3://$BUCKET/latest echo "$VERSION" | write_to_s3 "s3://$BUCKET/latest"
fi fi
} }
# Upload the index script # Upload the index script
release_index() { release_index() {
sed "s,url='https://get.docker.com/',url='$(s3_url)/'," hack/install.sh | write_to_s3 s3://$BUCKET/index sed "s,url='https://get.docker.com/',url='$(s3_url)/'," hack/install.sh | write_to_s3 "s3://$BUCKET/index"
} }
release_test() { release_test() {
if [ -e "bundles/$VERSION/test" ]; then if [ -e "bundles/$VERSION/test" ]; then
s3cmd --acl-public sync bundles/$VERSION/test/ s3://$BUCKET/test/ s3cmd --acl-public sync "bundles/$VERSION/test/" "s3://$BUCKET/test/"
fi fi
} }
setup_gpg() { setup_gpg() {
# Make sure that we have our keys # Make sure that we have our keys
mkdir -p $HOME/.gnupg/ mkdir -p "$HOME/.gnupg/"
s3cmd sync s3://$BUCKET/ubuntu/.gnupg/ $HOME/.gnupg/ || true s3cmd sync "s3://$BUCKET/ubuntu/.gnupg/" "$HOME/.gnupg/" || true
gpg --list-keys releasedocker >/dev/null || { gpg --list-keys releasedocker >/dev/null || {
gpg --gen-key --batch <<EOF gpg --gen-key --batch <<EOF
Key-Type: RSA Key-Type: RSA