Skip to content

Commit

Permalink
Add YAML lint
Browse files Browse the repository at this point in the history
Fix YAML style
  • Loading branch information
sbrunner committed Nov 1, 2017
1 parent b426771 commit 38d6b1a
Show file tree
Hide file tree
Showing 27 changed files with 2,034 additions and 1,912 deletions.
565 changes: 297 additions & 268 deletions .travis.yml

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ build: $(MAKO_FILES:.mako=) \
doc: $(BUILD_DIR)/sphinx.timestamp

.PHONY: checks
checks: flake8 git-attributes quote spell
checks: flake8 git-attributes quote spell yamllint

.PHONY: clean
clean:
Expand Down Expand Up @@ -181,6 +181,11 @@ quote:
spell:
@codespell geoportal/setup.py $(shell find geoportal/c2cgeoportal_geoportal -name static -prune -or -name '*.py' -print)

YAML_FILES ?= $(shell find -name ngeo -prune -or \( -name "*.yml" -or -name "*.yaml" \) -print)
.PHONY: yamllint
yamllint: $(YAML_FILES)
yamllint --strict --config-file=yamllint.yaml -s $(YAML_FILES)

# i18n
$(HOME_DIR)/.transifexrc:
$(PRERULE_CMD)
Expand Down
52 changes: 27 additions & 25 deletions docker-compose.yaml.mako
Original file line number Diff line number Diff line change
@@ -1,33 +1,35 @@
---

version: '2'

volumes:
c2cgpbuild:
external:
name: ${build_volume_name}
c2cgpbuild:
external:
name: ${build_volume_name}

services:

db:
build: docker/gis-db
image: camptocamp/c2cgeoportal-gis-db
environment:
- POSTGRES_USER=www-data
- POSTGRES_PASSWORD=www-data
- POSTGRES_DB=geomapfish_test
db:
build: docker/gis-db
image: camptocamp/c2cgeoportal-gis-db
environment:
- POSTGRES_USER=www-data
- POSTGRES_PASSWORD=www-data
- POSTGRES_DB=geomapfish_test

mapserver:
build: docker/test-mapserver
image: camptocamp/c2cgeoportal-test-mapserver
mapserver:
build: docker/test-mapserver
image: camptocamp/c2cgeoportal-test-mapserver

build:
image: camptocamp/geomapfish-build-dev:2.3
volumes:
- c2cgpbuild:/build
- .:/src
environment:
- USER_NAME
- USER_ID
- GROUP_ID
stdin_open: true
tty: true
command: ${'$'}{RUN}
build:
image: camptocamp/geomapfish-build-dev:2.3
volumes:
- c2cgpbuild:/build
- .:/src
environment:
- USER_NAME
- USER_ID
- GROUP_ID
stdin_open: true
tty: true
command: ${'$'}{RUN}
1 change: 1 addition & 0 deletions docker/build/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ tilecloud-chain==1.4.0.dev9 # Tile generation
transifex-client==0.12.4 # Makefile
virtualenv==15.1.0 # Makefile
waitress==1.1.0 # For pcreate
yamllint==1.9.0 # lint
zgitignore==0.8.0 # Makefile
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
---

sudo: false

git:
submodules: false
submodules: false

language: node_js

node_js:
- '6'
- '6'

addons:
apt:
packages:
- python-virtualenv
- python-virtualenv

script:
- make checks
- make checks
Original file line number Diff line number Diff line change
@@ -1,41 +1,43 @@
---
# A compose file for development.

version: '2'

volumes:
build:
external:
name: ${build_volume_name}
build:
external:
name: ${build_volume_name}

services:
% if dbhost == "db":
db:
image: ${docker_base}-testdb:${docker_tag}
environment:
POSTGRES_USER: ${dbuser}
POSTGRES_DB: ${db}
POSTGRES_PASSWORD: ${dbpassword}
db:
image: ${docker_base}-testdb:${docker_tag}
environment:
POSTGRES_USER: ${dbuser}
POSTGRES_DB: ${db}
POSTGRES_PASSWORD: ${dbpassword}
% if development == "TRUE":
ports:
- 15432:5432
ports:
- 15432:5432
% endif
% endif

mapserver:
image: ${docker_base}-mapserver:${docker_tag}
mapserver:
image: ${docker_base}-mapserver:${docker_tag}
% if development == "TRUE":
ports:
- 8380:80
ports:
- 8380:80
% endif

build:
image: camptocamp/geomapfish-build:${geomapfish_version}
volumes:
- build:/build
- .:/src
environment:
- USER_NAME
- USER_ID
- GROUP_ID
stdin_open: true
tty: true
command: ${'$'}{RUN}
build:
image: camptocamp/geomapfish-build:${geomapfish_version}
volumes:
- build:/build
- .:/src
environment:
- USER_NAME
- USER_ID
- GROUP_ID
stdin_open: true
tty: true
command: ${'$'}{RUN}
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
# A compose file for development.
version: '2'
services:
Expand All @@ -10,25 +11,25 @@ services:
POSTGRES_PASSWORD: ${dbpassword}
% if development == "TRUE":
ports:
- 15432:5432
- 15432:5432
% endif
% endif

print:
image: ${docker_base}-print:${docker_tag}
% if development == "TRUE":
ports:
- 8280:8080
- 8280:8080
% endif

mapserver:
image: ${docker_base}-mapserver:${docker_tag}
% if development == "TRUE":
ports:
- 8380:80
- 8380:80
% endif

geoportal:
image: ${docker_base}-geoportal:${docker_tag}
ports:
- 8080:80
- 8080:80
Loading

0 comments on commit 38d6b1a

Please sign in to comment.