From d2d29f549fa003d923223418a28e50dbc56ca464 Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 23 Feb 2017 12:33:59 +0530 Subject: [PATCH] config: move default config var to Dockerfile --- bitnami/solr/Dockerfile | 9 +++++++++ bitnami/solr/rootfs/app-entrypoint.sh | 5 ----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/bitnami/solr/Dockerfile b/bitnami/solr/Dockerfile index 371f8e19b1ef..edbf21595487 100644 --- a/bitnami/solr/Dockerfile +++ b/bitnami/solr/Dockerfile @@ -17,6 +17,15 @@ RUN bitnami-pkg unpack solr-6.3.0-0 --checksum 380f620eb733b8609cbf7767d8ec61dd7 COPY rootfs / +ENV APACHE_HTTP_PORT="80" \ + APACHE_HTTPS_PORT="443" \ + CODIAD_USERNAME="user" \ + CODIAD_PASSWORD="bitnami" \ + CODIAD_PROJECT_NAME="Sample Project" \ + CODIAD_PROJECT_PATH="sampleProject" \ + CODIAD_THEME="default" \ + CODIAD_HOST="127.0.0.1" + VOLUME ["/bitnami/solr"] EXPOSE 8983 diff --git a/bitnami/solr/rootfs/app-entrypoint.sh b/bitnami/solr/rootfs/app-entrypoint.sh index b0cf5df73f72..262e711139aa 100755 --- a/bitnami/solr/rootfs/app-entrypoint.sh +++ b/bitnami/solr/rootfs/app-entrypoint.sh @@ -14,11 +14,6 @@ function initialize { fi } -# Set default values -export SOLR_PORT=${SOLR_PORT:-"8983"} -export SOLR_SERVER_DIRECTORY=${SOLR_SERVER_DIRECTORY:-"server"} -export SOLR_CORE_CONF_DIR=${SOLR_CORE_CONF_DIR:-"data_driven_schema_configs"} - if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then