From bd31b24336ff2da098e62a375552586434a012b0 Mon Sep 17 00:00:00 2001 From: YuPengZTE Date: Thu, 22 Sep 2016 10:15:18 +0800 Subject: [PATCH] Capitalizes the first letter in notes of dockerfile Signed-off-by: YuPengZTE --- Dockerfile | 12 ++++++------ Dockerfile.aarch64 | 10 +++++----- Dockerfile.armhf | 10 +++++----- Dockerfile.ppc64le | 10 +++++----- Dockerfile.s390x | 10 +++++----- Dockerfile.simple | 4 ++-- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65b35be024..b7a6f86aa0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,13 +25,13 @@ FROM debian:jessie -# add zfs ppa +# Add zfs ppa RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 \ || apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list -# allow replacing httpredir mirror +# Allow replacing httpredir mirror ARG APT_MIRROR=httpredir.debian.org RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list @@ -84,7 +84,7 @@ ENV LVM2_VERSION 2.02.103 RUN mkdir -p /usr/local/lvm2 \ && curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \ | tar -xzC /usr/local/lvm2 --strip-components=1 -# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags +# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags # Compile and install lvm2 RUN cd /usr/local/lvm2 \ @@ -93,7 +93,7 @@ RUN cd /usr/local/lvm2 \ --enable-static_link \ && make device-mapper \ && make install_device-mapper -# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL # Configure the container for OSX cross compilation ENV OSX_SDK MacOSX10.11.sdk @@ -106,7 +106,7 @@ RUN set -x \ && UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh ENV PATH /osxcross/target/bin:$PATH -# install seccomp: the version shipped in trusty is too old +# Install seccomp: the version shipped in trusty is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \ @@ -220,7 +220,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \ debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \ hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7 -# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) +# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 212259bf02..4f1b7d03f0 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -62,9 +62,9 @@ ENV LVM2_VERSION 2.02.103 RUN mkdir -p /usr/local/lvm2 \ && curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \ | tar -xzC /usr/local/lvm2 --strip-components=1 -# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags +# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags -# fix platform enablement in lvm2 to support aarch64 properly +# Fix platform enablement in lvm2 to support aarch64 properly RUN set -e \ && for f in config.guess config.sub; do \ curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \ @@ -78,9 +78,9 @@ RUN cd /usr/local/lvm2 \ --enable-static_link \ && make device-mapper \ && make install_device-mapper -# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL -# install seccomp: the version shipped in trusty is too old +# Install seccomp: the version shipped in trusty is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \ @@ -163,7 +163,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ aarch64/busybox:latest@sha256:b23a6a37cf269dff6e46d2473b6e227afa42b037e6d23435f1d2bc40fc8c2828 \ aarch64/debian:jessie@sha256:4be74a41a7c70ebe887b634b11ffe516cf4fcd56864a54941e56bb49883c3170 \ aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda -# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) +# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9722381b89..44b0fe523d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -53,7 +53,7 @@ ENV LVM2_VERSION 2.02.103 RUN mkdir -p /usr/local/lvm2 \ && curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \ | tar -xzC /usr/local/lvm2 --strip-components=1 -# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags +# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags # Compile and install lvm2 RUN cd /usr/local/lvm2 \ @@ -62,7 +62,7 @@ RUN cd /usr/local/lvm2 \ --enable-static_link \ && make device-mapper \ && make install_device-mapper -# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL # Install Go ENV GO_VERSION 1.7.1 @@ -71,7 +71,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go:/go/src/github.com/docker/docker/vendor -# we're building for armhf, which is ARMv7, so let's be explicit about that +# We're building for armhf, which is ARMv7, so let's be explicit about that ENV GOARCH arm ENV GOARM 7 @@ -86,7 +86,7 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint && (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \ && go install -v github.com/golang/lint/golint -# install seccomp: the version shipped in trusty is too old +# Install seccomp: the version shipped in trusty is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \ @@ -161,7 +161,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ armhf/busybox:latest@sha256:d98a7343ac750ffe387e3d514f8521ba69846c216778919b01414b8617cfb3d4 \ armhf/debian:jessie@sha256:4a2187483f04a84f9830910fe3581d69b3c985cc045d9f01d8e2f3795b28107b \ armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791 -# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) +# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index e0e25c00d8..be0d3f3217 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -54,9 +54,9 @@ ENV LVM2_VERSION 2.02.103 RUN mkdir -p /usr/local/lvm2 \ && curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \ | tar -xzC /usr/local/lvm2 --strip-components=1 -# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags +# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags -# fix platform enablement in lvm2 to support ppc64le properly +# Fix platform enablement in lvm2 to support ppc64le properly RUN set -e \ && for f in config.guess config.sub; do \ curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \ @@ -70,9 +70,9 @@ RUN cd /usr/local/lvm2 \ --enable-static_link \ && make device-mapper \ && make install_device-mapper -# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL -# install seccomp: the version shipped in jessie is too old +# Install seccomp: the version shipped in jessie is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \ @@ -181,7 +181,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ ppc64le/busybox:latest@sha256:38bb82085248d5a3c24bd7a5dc146f2f2c191e189da0441f1c2ca560e3fc6f1b \ ppc64le/debian:jessie@sha256:412845f51b6ab662afba71bc7a716e20fdb9b84f185d180d4c7504f8a75c4f91 \ ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974 -# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) +# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a diff --git a/Dockerfile.s390x b/Dockerfile.s390x index 1d57f797c1..deec4fcc32 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -57,7 +57,7 @@ RUN echo 'deb http://httpredir.debian.org/debian jessie-proposed-updates main' > && apt-get install -y libc6 \ && rm -rf /var/lib/apt/lists/* -# install seccomp: the version shipped in jessie is too old +# Install seccomp: the version shipped in jessie is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \ @@ -77,9 +77,9 @@ ENV LVM2_VERSION 2.02.103 RUN mkdir -p /usr/local/lvm2 \ && curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \ | tar -xzC /usr/local/lvm2 --strip-components=1 -# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags +# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags -# fix platform enablement in lvm2 to support s390x properly +# Fix platform enablement in lvm2 to support s390x properly RUN set -e \ && for f in config.guess config.sub; do \ curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \ @@ -93,7 +93,7 @@ RUN cd /usr/local/lvm2 \ --enable-static_link \ && make device-mapper \ && make install_device-mapper -# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL +# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL ENV GO_VERSION 1.7.1 RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-s390x.tar.gz" \ @@ -173,7 +173,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \ s390x/busybox:latest@sha256:dd61522c983884a66ed72d60301925889028c6d2d5e0220a8fe1d9b4c6a4f01b \ s390x/debian:jessie@sha256:b74c863400909eff3c5e196cac9bfd1f6333ce47aae6a38398d87d5875da170a \ s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699 -# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) +# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is) # Download toml validator ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a diff --git a/Dockerfile.simple b/Dockerfile.simple index d24a41041d..99f7009cd1 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -7,7 +7,7 @@ FROM debian:jessie -# compile and runtime deps +# Compile and runtime deps # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies RUN apt-get update && apt-get install -y --no-install-recommends \ @@ -30,7 +30,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ aufs-tools \ && rm -rf /var/lib/apt/lists/* -# install seccomp: the version shipped in trusty is too old +# Install seccomp: the version shipped in trusty is too old ENV SECCOMP_VERSION 2.3.1 RUN set -x \ && export SECCOMP_PATH="$(mktemp -d)" \