Update to most recent latest builds (#3161)

* Merge snapshot and latest build for Logstash into 1 docker file
elastic · Dec 9, 2016 · 37701a2 · 37701a2
1 parent 77ef379
commit 37701a2
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 31 deletions.
diff --git a/...ments/docker/logstash/Dockerfile-snapshot → ...g/environments/docker/logstash/Dockerfile b/...ments/docker/logstash/Dockerfile-snapshot → ...g/environments/docker/logstash/Dockerfile
@@ -1,10 +1,10 @@
 FROM java:8-jre
 
-ENV LS_VERSION 5
+ARG LS_DOWNLOAD_URL
+ARG LS_VERSION
 
-ENV VERSION 6.0.0-alpha1-SNAPSHOT
-ENV URL https://snapshots.elastic.co/downloads/logstash/logstash-${VERSION}.tar.gz
-ENV PATH $PATH:/opt/logstash-$VERSION/bin
+ENV URL ${LS_DOWNLOAD_URL}/logstash-${LS_VERSION}.tar.gz
+ENV PATH $PATH:/opt/logstash-${LS_VERSION}/bin
 
 # Cache variable can be set during building to invalidate the build cache with `--build-arg CACHE=$(date +%s) .`
 ARG CACHE=1

diff --git a/testing/environments/docker/logstash/Dockerfile-5.0.0 b/testing/environments/docker/logstash/Dockerfile-5.0.0
diff --git a/testing/environments/docker/logstash/Dockerfile-latest b/testing/environments/docker/logstash/Dockerfile-latest
diff --git a/testing/environments/latest.yml b/testing/environments/latest.yml
@@ -4,7 +4,7 @@
 version: '2'
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:latest
+    image: docker.elastic.co/elasticsearch/elasticsearch:5.1.1
     environment:
         - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
         - "network.host="
@@ -15,7 +15,10 @@ services:
   logstash:
     build:
       context: docker/logstash
-      dockerfile: Dockerfile-latest
+      dockerfile: Dockerfile
+      args:
+        LS_VERSION: 5.1.1
+        LS_DOWNLOAD_URL: https://artifacts.elastic.co/downloads/logstash
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:latest
+    image: docker.elastic.co/kibana/kibana:5.1.1
diff --git a/testing/environments/snapshot.yml b/testing/environments/snapshot.yml
@@ -19,7 +19,11 @@ services:
   logstash:
     build:
       context: ./docker/logstash
-      dockerfile: Dockerfile-snapshot
+      dockerfile: Dockerfile
+      args:
+        LS_VERSION: 6.0.0-alpha1-SNAPSHOT
+        LS_DOWNLOAD_URL: https://snapshots.elastic.co/downloads/logstash
+
 
   kibana:
     build: