Updated snapshot-2x environment for the 1.2.2 release testing (elasti…

…c#1445) Also fixed the LS deb URL for alpha1
clennpillo · Apr 21, 2016 · e8576e7 · e8576e7
1 parent f5b1838
commit e8576e7
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 3 deletions.
diff --git a/testing/environments/docker/elasticsearch/Dockerfile-2.3.2 b/testing/environments/docker/elasticsearch/Dockerfile-2.3.2
@@ -0,0 +1,48 @@
+FROM java:8-jre
+
+# grab gosu for easy step-down from root
+RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4
+RUN arch="$(dpkg --print-architecture)" \
+	&& set -x \
+	&& curl -o /usr/local/bin/gosu -fSL "https://github.com/tianon/gosu/releases/download/1.3/gosu-$arch" \
+	&& curl -o /usr/local/bin/gosu.asc -fSL "https://github.com/tianon/gosu/releases/download/1.3/gosu-$arch.asc" \
+	&& gpg --verify /usr/local/bin/gosu.asc \
+	&& rm /usr/local/bin/gosu.asc \
+	&& chmod +x /usr/local/bin/gosu
+
+RUN apt-key adv --keyserver ha.pool.sks-keyservers.net --recv-keys 46095ACC8548582C1A2699A9D27D666CD88E42B4
+
+ENV ELASTICSEARCH_MAJOR 2.3
+ENV ELASTICSEARCH_VERSION 2.3.2
+
+RUN wget https://download.elasticsearch.org/elasticsearch/staging/2.3.2-9fb8bc6/org/elasticsearch/distribution/deb/elasticsearch/2.3.2/elasticsearch-2.3.2.deb
+
+RUN dpkg -i elasticsearch-${ELASTICSEARCH_VERSION}.deb
+
+ENV PATH /usr/share/elasticsearch/bin:$PATH
+
+RUN set -ex \
+	&& for path in \
+		/usr/share/elasticsearch/data \
+		/usr/share/elasticsearch/logs \
+		/usr/share/elasticsearch/config \
+		/usr/share/elasticsearch/config/scripts \
+	; do \
+		mkdir -p "$path"; \
+		chown -R elasticsearch:elasticsearch "$path"; \
+	done
+
+COPY config /usr/share/elasticsearch/config
+
+VOLUME /usr/share/elasticsearch/data
+
+COPY docker-entrypoint.sh /
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+
+EXPOSE 9200 9300
+
+CMD ["elasticsearch"]
+
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/testing/environments/docker/logstash/Dockerfile-2.3.2 b/testing/environments/docker/logstash/Dockerfile-2.3.2
@@ -0,0 +1,30 @@
+FROM java:8-jre
+
+ENV LS_VERSION 2
+
+ENV DEB_URL https://download.elastic.co/logstash/logstash/logstash-2.3.2.snapshot1_all.deb?c=20160421
+
+ENV PATH $PATH:/opt/logstash/bin:/opt/logstash/vendor/jruby/bin
+
+# install logstash
+RUN set -x && \
+    mkdir -p /var/tmp && \
+    wget -qO /var/tmp/logstash.deb $DEB_URL && \
+    apt-get update -y && \
+    apt-get install -y logrotate git && \
+    dpkg -i /var/tmp/logstash.deb && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN plugin install logstash-input-beats
+
+COPY logstash.conf.2.tmpl /logstash.conf.2.tmpl
+COPY docker-entrypoint.sh /entrypoint.sh
+
+COPY pki /etc/pki
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+CMD logstash agent -f /logstash.conf
+
+
diff --git a/testing/environments/docker/logstash/Dockerfile-5.0.0-alpha1 b/testing/environments/docker/logstash/Dockerfile-5.0.0-alpha1
@@ -3,7 +3,7 @@ FROM java:8-jre
 ENV LS_VERSION 5
 
 # As all snapshot builds have the same url, the image is cached. The date at then can be used to invalidate the image
-ENV DEB_URL https://download.elastic.co/logstash/logstash/logstash_5.0.0~alpha1~snapshot2-1_all.deb?20160330
+ENV DEB_URL https://download.elastic.co/logstash/logstash/packages/debian/logstash_5.0.0~alpha1-1_all.deb
 
 ENV PATH $PATH:/opt/logstash/bin:/opt/logstash/vendor/jruby/bin
 

diff --git a/testing/environments/snapshot-2x.yml b/testing/environments/snapshot-2x.yml
@@ -2,12 +2,12 @@
 # This is based on base.yml
 elasticsearch:
   build: ./docker/elasticsearch
-  dockerfile: Dockerfile-2.3.0
+  dockerfile: Dockerfile-2.3.2
   command: elasticsearch -Des.network.host=0.0.0.0
 
 logstash:
   build: ./docker/logstash
-  dockerfile: Dockerfile-2.3.0
+  dockerfile: Dockerfile-2.3.2
 
 kibana:
   build: ./docker/kibana