Compare commits

..

No commits in common. "4d7d6009d15c40e5120d2534f2747f97c7e8c204" and "ac46887e75450415a040909954ef2ad50654ba74" have entirely different histories.

4 changed files with 6 additions and 17 deletions

View File

@ -2,7 +2,4 @@ ARG IMAGE_NAME
ARG IMAGE_VERSION
FROM ${IMAGE_NAME}:${IMAGE_VERSION}
# 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"]
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

View File

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

View File

@ -2,7 +2,7 @@
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
IMAGE_NAME="adminer"
IMAGE_NAME="clue/adminer"
IMAGE_VERSION="latest"
SERVICE_NAME=adminer
@ -15,8 +15,6 @@ 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
@ -33,8 +31,6 @@ 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

View File

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