[es] Upgrade to 5.4.0

[cass] Remove deprecated image from build script
[gremlin] Switch to openjdk:8 base
2026-02-17 07:03:57 +00:00 · 2017-05-04 21:43:01 -05:00 · 2017-05-02 19:49:40 -05:00 · 2017-05-02 19:42:47 -05:00 · 2017-05-02 19:24:12 -05:00 · 2017-05-02 21:29:17 +02:00
14 changed files with 25 additions and 27 deletions
--- a/2
+++ b/2
@@ -5,10 +5,8 @@ pkgs="$pkgs minecraft-server"
 pkgs="$pkgs elasticsearch"
 pkgs="$pkgs kibana"
 pkgs="$pkgs titan-gremlin"
-pkgs="$pkgs cassandra"

 for p in $pkgs
 do
  docker build -t itzg/$p $p
 done
-
--- a/elasticsearch/Dockerfile
+++ b/elasticsearch/Dockerfile
@@ -1,10 +1,10 @@
 FROM openjdk:8u121-jre-alpine

-MAINTAINER itzg
+LABEL maintainer "itzg"

 RUN apk -U add bash

-ENV ES_VERSION=5.3.2
+ENV ES_VERSION=5.4.0

 ADD https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-$ES_VERSION.tar.gz /tmp/es.tgz
 RUN cd /usr/share && \
--- a/elasticsearch/docker-compose-localbuild.yml
+++ b/elasticsearch/docker-compose-localbuild.yml
--- a/gitblit/Dockerfile
+++ b/gitblit/Dockerfile
@@ -1,18 +1,18 @@
 FROM java:8
- 
-MAINTAINER itzg
+
+LABEL maintainer "itzg"

 ENV GITBLIT_VERSION 1.7.1
- 
+
 RUN wget -qO /tmp/gitblit.tgz http://dl.bintray.com/gitblit/releases/gitblit-$GITBLIT_VERSION.tar.gz
- 
+
 RUN tar -C /opt -xvf /tmp/gitblit.tgz && \
    rm /tmp/gitblit.tgz
- 
+
 VOLUME ["/data"]
- 
+
 ADD start.sh /start
- 
+
 ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
    GITBLIT_HTTPS_PORT=443 \
    GITBLIT_HTTP_PORT=80 \
@@ -20,7 +20,7 @@ ENV GITBLIT_PATH=/opt/gitblit-${GITBLIT_VERSION} \
    GITBLIT_ADMIN_USER=admin \
    GITBLIT_INITIAL_REPO=
 WORKDIR $GITBLIT_PATH
- 
+
 EXPOSE 80 443
- 
+
 ENTRYPOINT ["/start"]
--- a/gvm/Dockerfile
+++ b/gvm/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-MAINTAINER itzg
+LABEL maintainer "itzg"

 RUN apt-get install -y curl unzip

--- a/jekyll-github-pages/Dockerfile
+++ b/jekyll-github-pages/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:trusty

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV APT_GET_UPDATE 2014-09-18

@@ -21,4 +21,3 @@ EXPOSE 4000

 ADD start.sh /start
 CMD ["/start"]
-
--- a/jenkins/Dockerfile
+++ b/jenkins/Dockerfile
@@ -1,6 +1,6 @@
 FROM java:openjdk-8u102-jdk

-MAINTAINER itzg
+LABEL maintainer "itzg"

 RUN apt-get update && \
  DEBIAN_FRONTEND=noninteractive apt-get install -y \
--- a/kibana/Dockerfile
+++ b/kibana/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8u111-jre

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV KIBANA_VERSION 5.1.2

--- a/logstash/Dockerfile
+++ b/logstash/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV LOGSTASH_VERSION 1.5.0-1

--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -1,7 +1,7 @@
 FROM alpine


-MAINTAINER itzg
+LABEL maintainer "itzg"

 RUN echo "http://dl-3.alpinelinux.org/alpine/v3.5/community/" >> /etc/apk/repositories &&\
        apk update && \
--- a/spring-boot/Dockerfile
+++ b/spring-boot/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/gvm

-MAINTAINER itzg
+LABEL maintainer "itzg"

 RUN ["/run", "install", "springboot"]

--- a/titan-gremlin/Dockerfile
+++ b/titan-gremlin/Dockerfile
@@ -1,11 +1,12 @@
-FROM itzg/ubuntu-openjdk-7
+FROM openjdk:8-jre

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV TITAN_VERSION 0.5.4

-RUN wget -q -O /tmp/titan.zip http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip
-RUN unzip -q /tmp/titan.zip -d /opt && rm /tmp/titan.zip
+ADD http://s3.thinkaurelius.com/downloads/titan/titan-$TITAN_VERSION-hadoop2.zip /tmp/titan.zip
+RUN unzip -q /tmp/titan.zip -d /opt && \
+    rm /tmp/titan.zip

 ENV TITAN_HOME /opt/titan-$TITAN_VERSION-hadoop2
 WORKDIR $TITAN_HOME
--- a/titandb/Dockerfile
+++ b/titandb/Dockerfile
@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV APT_GET_UPDATE 2014-07-19

--- a/ubuntu-openjdk-7/Dockerfile
+++ b/ubuntu-openjdk-7/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:trusty

-MAINTAINER itzg
+LABEL maintainer "itzg"

 ENV APT_GET_UPDATE 2015-10-29
 RUN apt-get update
Author	SHA1	Message	Date
Geoff Bourne	2e03ee4197	[es] Upgrade to 5.4.0	2017-05-04 21:43:01 -05:00
Geoff Bourne	e8dd60a831	[cass] Remove deprecated image from build script	2017-05-02 19:49:40 -05:00
Geoff Bourne	dc15094b8a	[gremlin] Switch to openjdk:8 base	2017-05-02 19:42:47 -05:00
Geoff Bourne	fc807429e4	Merge pull request #143 from ben-st/label change deprecated maintainer to label	2017-05-02 19:24:12 -05:00
Benjamin	5ec21fc0ba	change deprecated maintainer to label	2017-05-02 21:29:17 +02:00
Geoff Bourne	3a0a8a9ced	[es] avoid auto-test for now	2017-04-29 14:16:08 -05:00