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

Add "ymlfmt" for enforcing consistent YAML whitespace

This commit is contained in:
Tianon Gravi 2017-11-28 13:50:23 -08:00
parent 14c4a7cfee
commit 9efeec18b6
18 changed files with 218 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -1,12 +1,13 @@
language: go
sudo: false
language: bash
services: docker
install:
- .travis/get-markdownfmt.sh
- docker pull tianon/markdownfmt
- docker pull tianon/ymlfmt
script:
- .travis/check-markdownfmt.sh
- .travis/check-ymlfmt.sh
- .travis/check-short.sh
- .travis/check-required-files.sh
- .travis/check-pr-no-readme.sh

4
.travis/check-markdownfmt.sh
View File

@ -8,11 +8,11 @@ files="$(
-name '*.md' \
-not -name 'README.md' \
\) -exec test -s '{}' ';' -print0 \
| xargs -0 markdownfmt -l)"
| xargs -0 ./markdownfmt.sh -l)"
if [ "$files" ]; then
echo >&2 'Need markdownfmt:'
echo >&2 "$files"
echo >&2
echo "$files" | xargs markdownfmt -d >&2
echo "$files" | xargs ./markdownfmt.sh -d >&2
exit 1
fi

22
.travis/check-ymlfmt.sh Executable file
View File

@ -0,0 +1,22 @@
#!/usr/bin/env bash
set -Eeuo pipefail
cd "$(dirname "$(readlink -f "$BASH_SOURCE")")/.."
files="$(find -name '*.yml')"
need=()
needdiff=
for f in $files; do
fdiff="$(./ymlfmt.sh -d "$f")"
if [ -n "$fdiff" ]; then
need+=( "$f" )
needdiff+="$fdiff"$'\n'
fi
done
if [ -n "$needdiff" ]; then
echo >&2 'Need ymlfmt:'
echo >&2 "${need[@]}"
echo >&2
echo >&2 -n "$needdiff"
exit 1
fi

20
adminer/stack.yml
View File

@ -4,14 +4,14 @@ version: '3.1'
services:
adminer:
image: adminer
restart: always
ports:
- 8080:8080
adminer:
image: adminer
restart: always
ports:
- 8080:8080
db:
image: mysql:5.6
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
db:
image: mysql:5.6
restart: always
environment:
MYSQL_ROOT_PASSWORD: example

80
bonita/stack.yml
View File

@ -2,43 +2,43 @@
version: '3'
services:
db:
image: postgres:9.3
environment:
POSTGRES_PASSWORD: example
restart: always
command:
- -c
- max_prepared_transactions=100
bonita:
image: bonita
ports:
- 8080:8080
environment:
- POSTGRES_ENV_POSTGRES_PASSWORD=example
- DB_VENDOR=postgres
- DB_HOST=db
- TENANT_LOGIN=tech_user
- TENANT_PASSWORD=secret
- PLATFORM_LOGIN=pfadmin
- PLATFORM_PASSWORD=pfsecret
restart: always
depends_on:
- db
entrypoint:
- bash
- -c
- |
set -e
echo 'Waiting for Postgres to be available'
export PGPASSWORD="$$POSTGRES_ENV_POSTGRES_PASSWORD"
maxTries=10
while [ "$$maxTries" -gt 0 ] && ! psql -h "$$DB_HOST" -U 'postgres' -c '\l'; do
sleep 1
done
echo
if [ "$$maxTries" -le 0 ]; then
echo >&2 'error: unable to contact Postgres after 10 tries'
exit 1
fi
exec /opt/files/startup.sh
db:
image: postgres:9.3
environment:
POSTGRES_PASSWORD: example
restart: always
command:
- -c
- max_prepared_transactions=100
bonita:
image: bonita
ports:
- 8080:8080
environment:
- POSTGRES_ENV_POSTGRES_PASSWORD=example
- DB_VENDOR=postgres
- DB_HOST=db
- TENANT_LOGIN=tech_user
- TENANT_PASSWORD=secret
- PLATFORM_LOGIN=pfadmin
- PLATFORM_PASSWORD=pfsecret
restart: always
depends_on:
- db
entrypoint:
- bash
- -c
- |
set -e
echo 'Waiting for Postgres to be available'
export PGPASSWORD="$$POSTGRES_ENV_POSTGRES_PASSWORD"
maxTries=10
while [ "$$maxTries" -gt 0 ] && ! psql -h "$$DB_HOST" -U 'postgres' -c '\l'; do
sleep 1
done
echo
if [ "$$maxTries" -le 0 ]; then
echo >&2 'error: unable to contact Postgres after 10 tries'
exit 1
fi
exec /opt/files/startup.sh

12
elasticsearch/stack.yml
View File

@ -2,10 +2,10 @@ version: '3.1'
services:
elasticsearch:
image: elasticsearch
elasticsearch:
image: elasticsearch
kibana:
image: kibana
ports:
- 5601:5601
kibana:
image: kibana
ports:
- 5601:5601

20
geonetwork/stack.yml
View File

@ -8,15 +8,15 @@
version: '3.1'
services:
geonetwork:
image: geonetwork
restart: always
ports:
- 8080:8080
environment:
DATA_DIR: /var/lib/geonetwork_data
volumes:
- geonetwork:/var/lib/geonetwork_data
geonetwork:
image: geonetwork
restart: always
ports:
- 8080:8080
environment:
DATA_DIR: /var/lib/geonetwork_data
volumes:
- geonetwork:/var/lib/geonetwork_data
volumes:
geonetwork:
geonetwork:

30
joomla/stack.yml
View File

@ -1,19 +1,19 @@
version: '3.1'
services:
joomla:
image: joomla
restart: always
links:
- joomladb:mysql
ports:
- 8080:80
environment:
JOOMLA_DB_HOST: joomladb
JOOMLA_DB_PASSWORD: example
joomla:
image: joomla
restart: always
links:
- joomladb:mysql
ports:
- 8080:80
environment:
JOOMLA_DB_HOST: joomladb
JOOMLA_DB_PASSWORD: example
joomladb:
image: mysql:5.6
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
joomladb:
image: mysql:5.6
restart: always
environment:
MYSQL_ROOT_PASSWORD: example

12
kibana/stack.yml
View File

@ -2,11 +2,11 @@ version: '3.1'
services:
kibana:
image: kibana
ports:
- 5601:5601
kibana:
image: kibana
ports:
- 5601:5601
elasticsearch:
image: elasticsearch
elasticsearch:
image: elasticsearch

20
mariadb/stack.yml
View File

@ -3,14 +3,14 @@ version: '3.1'
services:
db:
image: mariadb
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
db:
image: mariadb
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
adminer:
image: adminer
restart: always
ports:
- 8080:8080
adminer:
image: adminer
restart: always
ports:
- 8080:8080

2
markdownfmt.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash
set -e
exec docker run -i --rm -v "$PWD":/scratch -w /scratch tianon/markdownfmt markdownfmt "$@"
exec docker run -i --rm -v "$PWD":/scratch -w /scratch -u "$(id -u):$(id -g)" tianon/markdownfmt markdownfmt "$@"

8
mediawiki/stack.yml
View File

@ -22,7 +22,7 @@ services:
restart: always
environment:
# @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
MYSQL_DATABASE: 'my_wiki'
MYSQL_USER: 'wikiuser'
MYSQL_PASSWORD: 'example'
MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
MYSQL_DATABASE: my_wiki
MYSQL_USER: wikiuser
MYSQL_PASSWORD: example
MYSQL_RANDOM_ROOT_PASSWORD: yes

20
mysql/stack.yml
View File

@ -3,14 +3,14 @@ version: '3.1'
services:
db:
image: mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
db:
image: mysql
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
adminer:
image: adminer
restart: always
ports:
- 8080:8080
adminer:
image: adminer
restart: always
ports:
- 8080:8080

20
percona/stack.yml
View File

@ -3,14 +3,14 @@ version: '3.1'
services:
db:
image: percona
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
db:
image: percona
restart: always
environment:
MYSQL_ROOT_PASSWORD: example
adminer:
image: adminer
restart: always
ports:
- 8080:8080
adminer:
image: adminer
restart: always
ports:
- 8080:8080

20
postgres/stack.yml
View File

@ -3,14 +3,14 @@ version: '3.1'
services:
db:
image: postgres
restart: always
environment:
POSTGRES_PASSWORD: example
db:
image: postgres
restart: always
environment:
POSTGRES_PASSWORD: example
adminer:
image: adminer
restart: always
ports:
- 8080:8080
adminer:
image: adminer
restart: always
ports:
- 8080:8080

52
storm/stack.yml
View File

@ -1,31 +1,31 @@
version: '3.1'
services:
zookeeper:
image: zookeeper
container_name: zookeeper
restart: always
zookeeper:
image: zookeeper
container_name: zookeeper
restart: always
nimbus:
image: storm
container_name: nimbus
command: storm nimbus
depends_on:
- zookeeper
links:
- zookeeper
restart: always
ports:
- 6627:6627
nimbus:
image: storm
container_name: nimbus
command: storm nimbus
depends_on:
- zookeeper
links:
- zookeeper
restart: always
ports:
- 6627:6627
supervisor:
image: storm
container_name: supervisor
command: storm supervisor
depends_on:
- nimbus
- zookeeper
links:
- nimbus
- zookeeper
restart: always
supervisor:
image: storm
container_name: supervisor
command: storm supervisor
depends_on:
- nimbus
- zookeeper
links:
- nimbus
- zookeeper
restart: always

4
ymlfmt.sh Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -e
exec docker run -i --rm -v "$PWD":/scratch -w /scratch -u "$(id -u):$(id -g)" tianon/ymlfmt ymlfmt "$@"

54
zookeeper/stack.yml
View File

@ -1,32 +1,32 @@
version: '3.1'
services:
zoo1:
image: zookeeper
restart: always
hostname: zoo1
ports:
- 2181:2181
environment:
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo1:
image: zookeeper
restart: always
hostname: zoo1
ports:
- 2181:2181
environment:
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo2:
image: zookeeper
restart: always
hostname: zoo2
ports:
- 2182:2181
environment:
ZOO_MY_ID: 2
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo2:
image: zookeeper
restart: always
hostname: zoo2
ports:
- 2182:2181
environment:
ZOO_MY_ID: 2
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo3:
image: zookeeper
restart: always
hostname: zoo3
ports:
- 2183:2181
environment:
ZOO_MY_ID: 3
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo3:
image: zookeeper
restart: always
hostname: zoo3
ports:
- 2183:2181
environment:
ZOO_MY_ID: 3
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888