[es] Upgrade to 5.4.0

change deprecated maintainer to label

README.md

@@ -1,6 +1,10 @@
-dockerfiles
-===========
 
-Contains the various Dockerfile definitions I'm maintaining.
+This repository contains the various Dockerfile definitions I'm maintaining.
 
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itzg/dockerfiles?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+### Discontinued
+
+##### Cassandra
+
+I have found the [official image](https://hub.docker.com/_/cassandra/) to be quite sufficient

build

@@ -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
-

cassandra/Dockerfile

@@ -1,26 +0,0 @@
-FROM java:openjdk-8u72-jdk
-
-MAINTAINER itzg
-
-ENV CASSANDRA_VERSION 2.2.8
-
-ADD http://apache.mirrors.pair.com/cassandra/$CASSANDRA_VERSION/apache-cassandra-$CASSANDRA_VERSION-bin.tar.gz /tmp/apache-cassandra.tgz
-RUN tar -C /opt -zxf /tmp/apache-cassandra.tgz && \
-  rm /tmp/apache-cassandra.tgz
-
-
-RUN mv /opt/apache-cassandra-$CASSANDRA_VERSION /opt/cassandra
-ENV CASSANDRA_HOME /opt/cassandra
-ENV CASSANDRA_CONF /conf
-ENV CASSANDRA_DATA /data
-WORKDIR $CASSANDRA_HOME
-
-RUN ln -s $CASSANDRA_HOME/bin/* /usr/local/bin
-VOLUME ["/data","/conf"]
-
-EXPOSE 9042 9160 7000 7001
-
-ADD cassandra.in.sh $CASSANDRA_HOME/cassandra.in.sh
-RUN mv $CASSANDRA_HOME/bin/cassandra.in.sh $CASSANDRA_HOME/bin/orig.cassandra.in.sh
-
-CMD ["/opt/cassandra/bin/cassandra", "-f"]

cassandra/README.md

@@ -1,9 +0,0 @@
-Yet another Cassandra image, but this one got container and non-container access right.
-
-# Basic Usage
-
-To support access from both Docker containers and external, non-Docker clients:
-
-    docker run -d --name cassandra -e PUBLISH_AS=192.168.59.103 -p 9160:9160 itzg/cassandra
-
-replacing `192.168.59.103` with your Docker host's LAN IP address.

cassandra/cassandra.in.sh

@@ -1,24 +0,0 @@
-#!/bin/bash
-
-cassYml=$CASSANDRA_HOME/conf/cassandra.yaml
-
-privateAddr=$(hostname -i)
-
-seeds=${SEEDS:-${PUBLISH_AS:-$privateAddr}}
-
-sed -i -e "s/- seeds:.*/- seeds: \"$seeds\"/" \
-  -e "s/listen_address:.*/listen_address: $privateAddr/" \
-  -e "s/rpc_address:.*/rpc_address: $privateAddr/" \
-  -e "s/start_rpc:.*/start_rpc: true/" \
-  -e "s#- /var/lib/cassandra/data#- $CASSANDRA_DATA#" \
-  $cassYml
-
-if [ -n "$PUBLISH_AS" ]; then
-  sed -i -e "s/\(\s*#\)\?\s*broadcast_address:.*/broadcast_address: $PUBLISH_AS/" $cassYml
-fi
-
-# Copy over our tweaked files, but non-clobbering to let user have ultimate control
-cp -rn $CASSANDRA_HOME/conf/* $CASSANDRA_CONF
-
-# source the original
-. $CASSANDRA_HOME/bin/orig.cassandra.in.sh

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.1
+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 && \

elasticsearch/docker-compose-localbuild.yml

@@ -0,0 +1,44 @@
+version: '3'
+
+services:
+  master:
+    build: .
+    environment:
+      TYPE: MASTER
+      UNICAST_HOSTS: master
+      MIN_MASTERS: 1
+    deploy:
+      replicas: 1
+      update_config:
+        parallelism: 1
+  data:
+    build: .
+    environment:
+      TYPE: DATA
+      UNICAST_HOSTS: master
+    deploy:
+      replicas: 2
+      update_config:
+        parallelism: 1
+        delay: 60s
+  gateway:
+    build: .
+    ports:
+      - "9200:9200"
+      - "9300:9300"
+    environment:
+      TYPE: GATEWAY
+      UNICAST_HOSTS: master
+  ingest:
+    build: .
+    ports:
+      - "9222:9200"
+    environment:
+      TYPE: INGEST
+      UNICAST_HOSTS: master
+  kibana:
+    image: kibana
+    ports:
+      - "5601:5601"
+    environment:
+      ELASTICSEARCH_URL: http://gateway:9200

elasticsearch/start

@@ -20,7 +20,7 @@ discoverIpFromLink() {
 }
 
 discoverAllGlobalIps() {
-  if [ ${#IGNORE_NETWORK} -eq 0 ] 
+  if [ ${#IGNORE_NETWORK} -eq 0 ]
   then
     IGNORE_NETWORK='999.999.999.999'
   fi

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"]

gvm/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN apt-get install -y curl unzip
 

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"]
-

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 \

kibana/Dockerfile

@@ -1,6 +1,6 @@
 FROM openjdk:8u111-jre
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV KIBANA_VERSION 5.1.2
 

logstash/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV LOGSTASH_VERSION 1.5.0-1
 

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 && \

spring-boot/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/gvm
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 RUN ["/run", "install", "springboot"]
 

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

titandb/Dockerfile

@@ -1,6 +1,6 @@
 FROM itzg/ubuntu-openjdk-7
 
-MAINTAINER itzg
+LABEL maintainer "itzg"
 
 ENV APT_GET_UPDATE 2014-07-19
 

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