1. docker
  2. Commit a94067c07fbfa77cdc57aa33c2fe2270cabb9ca3
Browse code

Merge pull request #26803 from YuPengZTE/devFirstLetter

Capitalizes the first letter in notes of dockerfile

Lei Jitang authored on 2016/09/23 18:27:52
Showing 6 changed files
Dockerfile
History View file @ a94067c
... ... 
@@ -25,13 +25,13 @@
25 25
26 26 
 FROM debian:jessie
27 27
28 
-# add zfs ppa
28 
+# Add zfs ppa
29 29 
 RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 \
30 30 
 	|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
31 31 
 RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
32 32
33 33
34 
-# allow replacing httpredir mirror
34 
+# Allow replacing httpredir mirror
35 35 
 ARG APT_MIRROR=httpredir.debian.org
36 36 
 RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
37 37
... ... 
@@ -84,7 +84,7 @@ ENV LVM2_VERSION 2.02.103
84 84 
 RUN mkdir -p /usr/local/lvm2 \
85 85 
 	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
86 86 
 		| tar -xzC /usr/local/lvm2 --strip-components=1
87 
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
87 
+# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
88 88
89 89 
 # Compile and install lvm2
90 90 
 RUN cd /usr/local/lvm2 \
... ... 
@@ -93,7 +93,7 @@ RUN cd /usr/local/lvm2 \
93 93 
 		--enable-static_link \
94 94 
 	&& make device-mapper \
95 95 
 	&& make install_device-mapper
96 
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
96 
+# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
97 97
98 98 
 # Configure the container for OSX cross compilation
99 99 
 ENV OSX_SDK MacOSX10.11.sdk
... ... 
@@ -106,7 +106,7 @@ RUN set -x \
106 106 
 	&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
107 107 
 ENV PATH /osxcross/target/bin:$PATH
108 108
109 
-# install seccomp: the version shipped in trusty is too old
109 
+# Install seccomp: the version shipped in trusty is too old
110 110 
 ENV SECCOMP_VERSION 2.3.1
111 111 
 RUN set -x \
112 112 
 	&& export SECCOMP_PATH="$(mktemp -d)" \
... ... 
@@ -220,7 +220,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
220 220 
 	busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \
221 221 
 	debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \
222 222 
 	hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
223 
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
223 
+# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
224 224
225 225 
 # Download toml validator
226 226 
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
Dockerfile.aarch64
History View file @ a94067c
... ... 
@@ -62,9 +62,9 @@ ENV LVM2_VERSION 2.02.103
62 62 
 RUN mkdir -p /usr/local/lvm2 \
63 63 
 	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
64 64 
 		| tar -xzC /usr/local/lvm2 --strip-components=1
65 
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
65 
+# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
66 66
67 
-# fix platform enablement in lvm2 to support aarch64 properly
67 
+# Fix platform enablement in lvm2 to support aarch64 properly
68 68 
 RUN set -e \
69 69 
 	&& for f in config.guess config.sub; do \
70 70 
 		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 \
78 78 
 		--enable-static_link \
79 79 
 	&& make device-mapper \
80 80 
 	&& make install_device-mapper
81 
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
81 
+# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
82 82
83 
-# install seccomp: the version shipped in trusty is too old
83 
+# Install seccomp: the version shipped in trusty is too old
84 84 
 ENV SECCOMP_VERSION 2.3.1
85 85 
 RUN set -x \
86 86 
 	&& export SECCOMP_PATH="$(mktemp -d)" \
... ... 
@@ -163,7 +163,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
163 163 
 	aarch64/busybox:latest@sha256:b23a6a37cf269dff6e46d2473b6e227afa42b037e6d23435f1d2bc40fc8c2828 \
164 164 
 	aarch64/debian:jessie@sha256:4be74a41a7c70ebe887b634b11ffe516cf4fcd56864a54941e56bb49883c3170 \
165 165 
 	aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda
166 
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
166 
+# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
167 167
168 168 
 # Download toml validator
169 169 
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
Dockerfile.armhf
History View file @ a94067c
... ... 
@@ -53,7 +53,7 @@ ENV LVM2_VERSION 2.02.103
53 53 
 RUN mkdir -p /usr/local/lvm2 \
54 54 
 	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
55 55 
 		| tar -xzC /usr/local/lvm2 --strip-components=1
56 
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
56 
+# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
57 57
58 58 
 # Compile and install lvm2
59 59 
 RUN cd /usr/local/lvm2 \
... ... 
@@ -62,7 +62,7 @@ RUN cd /usr/local/lvm2 \
62 62 
 		--enable-static_link \
63 63 
 	&& make device-mapper \
64 64 
 	&& make install_device-mapper
65 
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
65 
+# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
66 66
67 67 
 # Install Go
68 68 
 ENV GO_VERSION 1.7.1
... ... 
@@ -71,7 +71,7 @@ RUN curl -fsSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-armv
71 71 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
72 72 
 ENV GOPATH /go:/go/src/github.com/docker/docker/vendor
73 73
74 
-# we're building for armhf, which is ARMv7, so let's be explicit about that
74 
+# We're building for armhf, which is ARMv7, so let's be explicit about that
75 75 
 ENV GOARCH arm
76 76 
 ENV GOARM 7
77 77
... ... 
@@ -86,7 +86,7 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint
86 86 
 	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
87 87 
 	&& go install -v github.com/golang/lint/golint
88 88
89 
-# install seccomp: the version shipped in trusty is too old
89 
+# Install seccomp: the version shipped in trusty is too old
90 90 
 ENV SECCOMP_VERSION 2.3.1
91 91 
 RUN set -x \
92 92 
 	&& export SECCOMP_PATH="$(mktemp -d)" \
... ... 
@@ -161,7 +161,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
161 161 
 	armhf/busybox:latest@sha256:d98a7343ac750ffe387e3d514f8521ba69846c216778919b01414b8617cfb3d4 \
162 162 
 	armhf/debian:jessie@sha256:4a2187483f04a84f9830910fe3581d69b3c985cc045d9f01d8e2f3795b28107b \
163 163 
 	armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791
164 
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
164 
+# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
165 165
166 166 
 # Download toml validator
167 167 
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
Dockerfile.ppc64le
History View file @ a94067c
... ... 
@@ -54,9 +54,9 @@ ENV LVM2_VERSION 2.02.103
54 54 
 RUN mkdir -p /usr/local/lvm2 \
55 55 
 	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
56 56 
 		| tar -xzC /usr/local/lvm2 --strip-components=1
57 
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
57 
+# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
58 58
59 
-# fix platform enablement in lvm2 to support ppc64le properly
59 
+# Fix platform enablement in lvm2 to support ppc64le properly
60 60 
 RUN set -e \
61 61 
 	&& for f in config.guess config.sub; do \
62 62 
 		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 \
70 70 
 		--enable-static_link \
71 71 
 	&& make device-mapper \
72 72 
 	&& make install_device-mapper
73 
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
73 
+# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
74 74
75 
-# install seccomp: the version shipped in jessie is too old
75 
+# Install seccomp: the version shipped in jessie is too old
76 76 
 ENV SECCOMP_VERSION 2.3.1
77 77 
 RUN set -x \
78 78 
         && export SECCOMP_PATH="$(mktemp -d)" \
... ... 
@@ -181,7 +181,7 @@ RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
181 181 
 	ppc64le/busybox:latest@sha256:38bb82085248d5a3c24bd7a5dc146f2f2c191e189da0441f1c2ca560e3fc6f1b \
182 182 
 	ppc64le/debian:jessie@sha256:412845f51b6ab662afba71bc7a716e20fdb9b84f185d180d4c7504f8a75c4f91 \
183 183 
 	ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974
184 
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
184 
+# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
185 185
186 186 
 # Download toml validator
187 187 
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
Dockerfile.s390x
History View file @ a94067c
... ... 
@@ -57,7 +57,7 @@ RUN echo 'deb http://httpredir.debian.org/debian jessie-proposed-updates main' >
57 57 
 	&& apt-get install -y libc6 \
58 58 
 	&& rm -rf /var/lib/apt/lists/*
59 59
60 
-# install seccomp: the version shipped in jessie is too old
60 
+# Install seccomp: the version shipped in jessie is too old
61 61 
 ENV SECCOMP_VERSION 2.3.1
62 62 
 RUN set -x \
63 63 
 	&& export SECCOMP_PATH="$(mktemp -d)" \
... ... 
@@ -77,9 +77,9 @@ ENV LVM2_VERSION 2.02.103
77 77 
 RUN mkdir -p /usr/local/lvm2 \
78 78 
 	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
79 79 
 		| tar -xzC /usr/local/lvm2 --strip-components=1
80 
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
80 
+# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
81 81
82 
-# fix platform enablement in lvm2 to support s390x properly
82 
+# Fix platform enablement in lvm2 to support s390x properly
83 83 
 RUN set -e \
84 84 
 	&& for f in config.guess config.sub; do \
85 85 
 		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 \
93 93 
 		--enable-static_link \
94 94 
 	&& make device-mapper \
95 95 
 	&& make install_device-mapper
96 
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
96 
+# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
97 97
98 98 
 ENV GO_VERSION 1.7.1
99 99 
 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 \
173 173 
 	s390x/busybox:latest@sha256:dd61522c983884a66ed72d60301925889028c6d2d5e0220a8fe1d9b4c6a4f01b \
174 174 
 	s390x/debian:jessie@sha256:b74c863400909eff3c5e196cac9bfd1f6333ce47aae6a38398d87d5875da170a \
175 175 
 	s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699
176 
-# see also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
176 
+# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
177 177
178 178 
 # Download toml validator
179 179 
 ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
Dockerfile.simple
History View file @ a94067c
... ... 
@@ -7,7 +7,7 @@
7 7
8 8 
 FROM debian:jessie
9 9
10 
-# compile and runtime deps
10 
+# Compile and runtime deps
11 11 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
12 12 
 # https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
13 13 
 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 \
30 30 
 		aufs-tools \
31 31 
 	&& rm -rf /var/lib/apt/lists/*
32 32
33 
-# install seccomp: the version shipped in trusty is too old
33 
+# Install seccomp: the version shipped in trusty is too old
34 34 
 ENV SECCOMP_VERSION 2.3.1
35 35 
 RUN set -x \
36 36 
 	&& export SECCOMP_PATH="$(mktemp -d)" \