-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix YAML style
- Loading branch information
Showing
27 changed files
with
2,014 additions
and
1,886 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 6 additions & 4 deletions
10
geoportal/c2cgeoportal_geoportal/scaffolds/create/+dot+travis.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
56 changes: 29 additions & 27 deletions
56
geoportal/c2cgeoportal_geoportal/scaffolds/create/docker-compose-build.yaml.mako
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.