From 7f471651ac9eedbe768e237761494e95be03e3db Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:30:17 +0200 Subject: [PATCH 01/10] add ide ignores --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 032708f..ed38038 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ config.php cache/*.cache + +# IDEs /.project +/nbproject/private/ +/.vscode \ No newline at end of file From d3d002d26ad71bb003be764c10c8746c0e2aaa48 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:30:38 +0200 Subject: [PATCH 02/10] add Dockerfile and docker-compose.yml --- Dockerfile | 4 ++++ docker-compose.yml | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 Dockerfile create mode 100644 docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..2b15d4f --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM php:7-alpine + +ADD . /usr/src/code +WORKDIR /usr/src/code diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..b3ef0fa --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +version: '2' +services: + php: + build: . + image: "php" + volumes: + - .:/usr/src/code + + de-map: + build: . + volumes: + - .:/usr/src/code + command: php data.php From 9778b7a32b736fd40ce4655516c739207020f1c2 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:31:00 +0200 Subject: [PATCH 03/10] add Makefile --- Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..7caea6d --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +images: + docker-compose build + +up: + docker-compose up de-map + +lint: + docker-compose run --rm php sh -c 'find . -name "*.php" -print0 | xargs -0 -n1 php -l' From d21c57239c02237bf549327f6cf18412184112f0 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:31:25 +0200 Subject: [PATCH 04/10] fix ignore for netbeans --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index ed38038..cfa0b82 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,5 @@ cache/*.cache # IDEs /.project -/nbproject/private/ +/nbproject /.vscode \ No newline at end of file From 9afeb15a4ace1efea7f8caa707284a3c1fbafe98 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:33:27 +0200 Subject: [PATCH 05/10] remove volume from de-map service it should be deployed and therefore copied once there, no volume for the src needed there --- docker-compose.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index b3ef0fa..7d56d08 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,6 +8,4 @@ services: de-map: build: . - volumes: - - .:/usr/src/code command: php data.php From b217efd3eb64de979e373185878a8a7b043e0178 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:38:15 +0200 Subject: [PATCH 06/10] add all target for Makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 7caea6d..8f61922 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +all: images + images: docker-compose build From c136a13332ca4cc0a6ab5d1424ec59662978b8e7 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 21:38:26 +0200 Subject: [PATCH 07/10] add docker to README.md --- README.md | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/README.md b/README.md index 493108a..92d32d4 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,29 @@ Das JSON-Schema ist in schema/nodelist-schema.json zu finden, gegen das man die Für den Export dieser Liste habe ich 2 PHP-Klassen beispielhaft implementiert https://github.com/StilgarBF/nodelistexport Die Karte wird dieses Format in Kürze auch verarbeiten. + +### Docker + +Build the images + +```shell +make +``` + +Do a linting on all php-files + +```shell +make lint +``` + +Fire a php server with de-map running data.php up (does not use code changed after `make` or `make images`) + +```shell +make up +``` + +Execute a single command for the current source code (development) + +```shell +docker-compose run --rm php php data.php +``` From 1c2b6fa1cb758bab809b4e912381665b7d8fb343 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 22:32:33 +0200 Subject: [PATCH 08/10] add travis.yml --- travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 travis.yml diff --git a/travis.yml b/travis.yml new file mode 100644 index 0000000..5b8edc9 --- /dev/null +++ b/travis.yml @@ -0,0 +1,12 @@ +language: php + +sudo: required + +services: + - docker + +before_install: + - make + +script: + - make lint From 4fd8ccb25b0b0bc0ab7bb8be133210dc08eca3b9 Mon Sep 17 00:00:00 2001 From: mjainta Date: Tue, 6 Jun 2017 22:35:30 +0200 Subject: [PATCH 09/10] fix .travis.yml filename --- travis.yml => .travis.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename travis.yml => .travis.yml (100%) diff --git a/travis.yml b/.travis.yml similarity index 100% rename from travis.yml rename to .travis.yml From 18a02b954ea97264c584ffee861bda7de997d8d2 Mon Sep 17 00:00:00 2001 From: Martin Jainta Date: Tue, 6 Jun 2017 22:46:51 +0200 Subject: [PATCH 10/10] add travis badge --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 92d32d4..5cc376a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +[![Build Status](https://travis-ci.org/mjainta/de-map.svg?branch=master)](https://travis-ci.org/mjainta/de-map) + de-map ======