Update elastic

adminer/Dockerfile

@@ -2,4 +2,7 @@ ARG IMAGE_NAME
 ARG IMAGE_VERSION
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN sed -i 's/max_execution_time.*/max_execution_time = 600/g' /etc/php5/cli/php.ini && sed -i 's/max_input_time.*/max_input_time = 600/g' /etc/php5/fpm/php.ini
+# Clue adminer override
+#RUN sed -i 's/max_execution_time.*/max_execution_time = 600/g' /etc/php5/cli/php.ini && sed -i 's/max_input_time.*/max_input_time = 600/g' /etc/php5/fpm/php.ini
+
+COPY ["conf.d/", "/usr/local/etc/php/conf.d"]

adminer/conf.d/execution-time.ini

@@ -0,0 +1,2 @@
+max_execution_time = 600
+max_input_time = 600

adminer/run.sh

@@ -2,7 +2,7 @@
 
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-IMAGE_NAME="clue/adminer"
+IMAGE_NAME="adminer"
 IMAGE_VERSION="latest"
 
 SERVICE_NAME=adminer
@@ -15,6 +15,8 @@ source ${SCRIPT_PATH}/../common.shinc
 #
 
 DOMAIN_NAME="adminer.loc"
+ADMINER_DESIGN="hever"
+ADMINER_PLUGINS="dump-date dump-json dump-php dump-zip edit-calendar edit-foreign edit-textarea"
 
 source ${SCRIPT_PATH}/env.shinc 2> /dev/null
 
@@ -31,6 +33,8 @@ init() {
 	docker create \
 		--name ${SERVICE_NAME} \
 		-e VIRTUAL_HOST=${DOMAIN_NAME} \
+		-e ADMINER_DESIGN="${ADMINER_DESIGN}" \
+		-e ADMINER_PLUGINS="${ADMINER_PLUGINS}" \
 		--restart=unless-stopped \
 		${SERVICE_NAME}:latest
 

elastic-search/run.sh

@@ -2,10 +2,10 @@
 
 SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
 
-IMAGE_NAME="docker.elastic.co/elasticsearch/elasticsearch"
-IMAGE_VERSION="5.3.2"
+IMAGE_NAME="elasticsearch"
+IMAGE_VERSION="2.3.5"
 
-SERVICE_NAME=elastic-search
+SERVICE_NAME=ys-elastic-search
 
 
 source ${SCRIPT_PATH}/../common.shinc
@@ -23,7 +23,7 @@ init() {
 	__init
 
 	# Create networks
-	NETWORKS=(${SEARCH_ENGINE_NETWORK})
+	NETWORKS=(${SEARCH_ENGINE_NETWORK} ${PROXY_NETWORK})
 	__createNetworks
 
 	__build || return $?
@@ -36,6 +36,8 @@ init() {
 
 	[[ $? -ne 0 ]] && return 1
 
+	docker network connect ${PROXY_NETWORK} ${SERVICE_NAME}
+
 	__ask_to_start
 }