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 language: bash
services: docker
sudo: false
install: install:
- .travis/get-markdownfmt.sh - docker pull tianon/markdownfmt
- docker pull tianon/ymlfmt
script: script:
- .travis/check-markdownfmt.sh - .travis/check-markdownfmt.sh
- .travis/check-ymlfmt.sh
- .travis/check-short.sh - .travis/check-short.sh
- .travis/check-required-files.sh - .travis/check-required-files.sh
- .travis/check-pr-no-readme.sh - .travis/check-pr-no-readme.sh

4
.travis/check-markdownfmt.sh
View File

@ -8,11 +8,11 @@ files="$(
-name '*.md' \ -name '*.md' \
-not -name 'README.md' \ -not -name 'README.md' \
\) -exec test -s '{}' ';' -print0 \ \) -exec test -s '{}' ';' -print0 \
| xargs -0 markdownfmt -l)" | xargs -0 ./markdownfmt.sh -l)"
if [ "$files" ]; then if [ "$files" ]; then
echo >&2 'Need markdownfmt:' echo >&2 'Need markdownfmt:'
echo >&2 "$files" echo >&2 "$files"
echo >&2 echo >&2
echo "$files" | xargs markdownfmt -d >&2 echo "$files" | xargs ./markdownfmt.sh -d >&2
exit 1 exit 1
fi 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: services:
adminer: adminer:
image: adminer image: adminer
restart: always restart: always
ports: ports:
- 8080:8080 - 8080:8080
db: db:
image: mysql:5.6 image: mysql:5.6
restart: always restart: always
environment: environment:
MYSQL_ROOT_PASSWORD: example MYSQL_ROOT_PASSWORD: example

80
bonita/stack.yml
View File

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

12
elasticsearch/stack.yml
View File

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

20
geonetwork/stack.yml
View File

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

30
joomla/stack.yml
View File

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

12
kibana/stack.yml
View File

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

20
mariadb/stack.yml
View File

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

2
markdownfmt.sh
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
set -e 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 restart: always
environment: environment:
# @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php # @see https://phabricator.wikimedia.org/source/mediawiki/browse/master/includes/DefaultSettings.php
MYSQL_DATABASE: 'my_wiki' MYSQL_DATABASE: my_wiki
MYSQL_USER: 'wikiuser' MYSQL_USER: wikiuser
MYSQL_PASSWORD: 'example' MYSQL_PASSWORD: example
MYSQL_RANDOM_ROOT_PASSWORD: 'yes' MYSQL_RANDOM_ROOT_PASSWORD: yes

20
mysql/stack.yml
View File

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

20
percona/stack.yml
View File

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

20
postgres/stack.yml
View File

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

52
storm/stack.yml
View File

@ -1,31 +1,31 @@
version: '3.1' version: '3.1'
services: services:
zookeeper: zookeeper:
image: zookeeper image: zookeeper
container_name: zookeeper container_name: zookeeper
restart: always restart: always
nimbus: nimbus:
image: storm image: storm
container_name: nimbus container_name: nimbus
command: storm nimbus command: storm nimbus
depends_on: depends_on:
- zookeeper - zookeeper
links: links:
- zookeeper - zookeeper
restart: always restart: always
ports: ports:
- 6627:6627 - 6627:6627
supervisor: supervisor:
image: storm image: storm
container_name: supervisor container_name: supervisor
command: storm supervisor command: storm supervisor
depends_on: depends_on:
- nimbus - nimbus
- zookeeper - zookeeper
links: links:
- nimbus - nimbus
- zookeeper - zookeeper
restart: always 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' version: '3.1'
services: services:
zoo1: zoo1:
image: zookeeper image: zookeeper
restart: always restart: always
hostname: zoo1 hostname: zoo1
ports: ports:
- 2181:2181 - 2181:2181
environment: environment:
ZOO_MY_ID: 1 ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo2: zoo2:
image: zookeeper image: zookeeper
restart: always restart: always
hostname: zoo2 hostname: zoo2
ports: ports:
- 2182:2181 - 2182:2181
environment: environment:
ZOO_MY_ID: 2 ZOO_MY_ID: 2
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888
zoo3: zoo3:
image: zookeeper image: zookeeper
restart: always restart: always
hostname: zoo3 hostname: zoo3
ports: ports:
- 2183:2181 - 2183:2181
environment: environment:
ZOO_MY_ID: 3 ZOO_MY_ID: 3
ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888 ZOO_SERVERS: server.1=zoo1:2888:3888 server.2=zoo2:2888:3888 server.3=zoo3:2888:3888