From 5c75b58f766bea4abbee2d3be598ff8c0b575b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Blaise=20de=20Carn=C3=A9?= Date: Wed, 9 Jan 2019 17:23:13 +0100 Subject: [PATCH 1/3] fix docker-compose, fix versions & prepare ontology update --- docker-compose.yml | 5 ++--- docker/Dockerfile | 2 +- docker/app/composer.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e5a6d1f..cff563b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,8 @@ version: '3.1' services: blazegraph: - image: conjecto/blazegraph + image: conjecto/blazegraph:2.1 + restart: always ports: - 9999:9999 environment: @@ -11,8 +12,6 @@ services: JAVA_XMX: 1g volumes: - ./dataset:/docker-entrypoint-initdb.d - ports: - - "9999:9999" datatourisme: build: docker diff --git a/docker/Dockerfile b/docker/Dockerfile index f83c331..e49cc4d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM php +FROM php:7.2 MAINTAINER Conjecto RUN apt-get update && apt-get install -y \ diff --git a/docker/app/composer.json b/docker/app/composer.json index 16cc628..efdc120 100644 --- a/docker/app/composer.json +++ b/docker/app/composer.json @@ -8,6 +8,6 @@ ], "require": { "php": "^7.0", - "datatourisme/api": "^1.0" + "datatourisme/api": "dev-feature/ontology-v2" } } From 7ad0dba8055b9b6f722c9108b355a6c7433fd9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Blaise=20de=20Carn=C3=A9?= Date: Mon, 14 Jan 2019 13:34:57 +0100 Subject: [PATCH 2/3] update datatourisme api version --- docker/app/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/app/composer.json b/docker/app/composer.json index efdc120..04eb2b7 100644 --- a/docker/app/composer.json +++ b/docker/app/composer.json @@ -8,6 +8,6 @@ ], "require": { "php": "^7.0", - "datatourisme/api": "dev-feature/ontology-v2" + "datatourisme/api": "^2.0" } } From 2ffa8a361429d461ee87b025c4a66f8fc9965c50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Blaise=20de=20Carn=C3=A9?= Date: Mon, 14 Jan 2019 13:36:48 +0100 Subject: [PATCH 3/3] update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c316675..8f3f65e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ Tous les changements notables apportés à ce projet seront documentés dans ce Le format est basé sur [Keep a Changelog](http://keepachangelog.com/fr/1.0.0/) et ce projet adhère à [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [2.0.0] - 2019-01-14 + +### Modifications +- Utilisation de l'ontologie DATAtourisme v2.0 + ## [1.0.1] - 2018-10-22 ### Corrections