Merge pull request #12 from DanielFran/master

Update Consul and git2consul versions
jhipster · Jun 28, 2018 · c142a9c · c142a9c
2 parents 940746b + a51a6ec
commit c142a9c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ MAINTAINER Pierre Besson https://github.com/PierreBesson
 RUN apk --update add nodejs git openssh curl bash inotify-tools jq && \
     rm -rf /var/cache/apk/* && \
     npm install -g simplywatch && \
-    npm install -g git2consul@0.12.12 && \
+    npm install -g git2consul@0.12.13 && \
     mkdir -p /etc/git2consul.d
 
 ADD /load-config.sh /

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
     consul:
-        image: consul:0.7.2
+        image: consul:1.2.0
         ports:
             - 8300:8300
             - 8500:8500