kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #10872 from jfrazelle/ugh-tomlv

Browse source 
fix tomlv because it doesn't read from stdin
This commit is contained in:
Alexander Morozov 2015-02-19 20:31:34 -08:00
commit a78ce5c228
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -151,7 +151,10 @@ RUN set -x \
&& go install -v github.com/cpuguy83/go-md2man && go install -v github.com/cpuguy83/go-md2man
# install toml validator # install toml validator
RUN git clone -b v0.1.0 https://github.com/BurntSushi/toml.git /go/src/github.com/BurntSushi/toml \ ENV TOMLV_COMMIT 9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
RUN set -x \
&& git clone https://github.com/BurntSushi/toml.git /go/src/github.com/BurntSushi/toml \
&& (cd /go/src/github.com/BurntSushi/toml && git checkout -q $TOMLV_COMMIT) \
&& go install -v github.com/BurntSushi/toml/cmd/tomlv && go install -v github.com/BurntSushi/toml/cmd/tomlv
# Wrap all commands in the "docker-in-docker" script to allow nested containers # Wrap all commands in the "docker-in-docker" script to allow nested containers

9
MAINTAINERS
View file

@ -531,6 +531,11 @@ made through a pull request.
Email = "lk4d4@docker.com" Email = "lk4d4@docker.com"
GitHub = "lk4d4" GitHub = "lk4d4"
[people.mary]
Name = "Mary Anthony"
Email = "mary.anthony@docker.com"
GitHub = "moxiegirl"
[people.shykes] [people.shykes]
Name = "Solomon Hykes" Name = "Solomon Hykes"
Email = "solomon@docker.com" Email = "solomon@docker.com"
@ -590,7 +595,3 @@ made through a pull request.
Name = "Vishnu Kannan" Name = "Vishnu Kannan"
Email = "vishnuk@google.com" Email = "vishnuk@google.com"
GitHub = "vishh" GitHub = "vishh"
[people.mary]
Name = "Mary Anthony"
Email = "mary.anthony@docker.com"

4
project/make/validate-toml
View file

@ -9,13 +9,13 @@ unset IFS
badFiles=() badFiles=()
for f in "${files[@]}"; do for f in "${files[@]}"; do
# we use "git show" here to validate that what's committed is formatted # we use "git show" here to validate that what's committed is formatted
if [ "$(git show "$VALIDATE_HEAD:$f" | tomlv)" ]; then if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then
badFiles+=( "$f" ) badFiles+=( "$f" )
fi fi
done done
if [ ${#badFiles[@]} -eq 0 ]; then if [ ${#badFiles[@]} -eq 0 ]; then
echo 'Congratulations! All toml source files have valid syntax.' echo 'Congratulations! All toml source files changed here have valid syntax.'
else else
{ {
echo "These files are not valid toml:" echo "These files are not valid toml:"