Commit 826038a9 authored by benedikt.kroening's avatar benedikt.kroening
Browse files

Some changes

Added option to specify config file
Moved docker build out of ox-installer
Fixed broken docker build
Updated readme
parent 90c1c8dc
......@@ -58,9 +58,12 @@ This installer supports creation of Open-Xchange docker images. These images wil
Right now it creates a simple groupware image (apache2, ox frontend, ox middleware). Seperate mail and database services are required.
Take a look at the docker-compose.yml at the root level of this repo.
### Build images
### Build docker images
The installer script can be used as it is for docker environments. Take a look into the docker/ directory for an singlenode example.
You can configure this environment by editing the 'docker/config' file.
In order to build an image execute the build script:
`$ ./ox-installer --build-docker`
`$ docker/build.sh`
### Start it
......
......@@ -33,7 +33,7 @@ OX_CONFIGDB_NAME=configdb
INSTALL_DATABASE=true
INSTALL_MIDDLEWARE=true
INSTALL_FRONTEND=true
INSTALL_GUARD=false
INSTALL_GUARD=true
INSTALL_DOCUMENTS=false
INSTALL_DOCUMENTCONVERTER=false
INSTALL_TYPE=singlenode
......
#!/bin/bash
#
# Copyright (C) 2019 OX Software GmbH
#
# This file is part of OX Automation.
#
# OX Automation is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OX Automation is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OX Automation. If not, see <http://www.gnu.org/licenses/>.
#
#
# Authors:
# Benedikt Kroening <benedikt.kroening@open-xchange.com>
#
set -e
SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P)"
# sourcing some commonly used functions and executing basic checks
source ${SCRIPT_DIR}/../lib/common.bash
checkRootPrivileges
detectDistribution
# sourcing the default configuration to use
# source ${SCRIPT_DIR}/config
OX_GUARD_ENDPOINT_URL="http://localhost:8009/guardadmin"
## Help text
show_usage() {
echo -n "
$0 [OPTIONS]
"
}
### reading config from command line; overriding defaults
POSITIONAL=()
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
show_usage
exit 0
shift
;;
--debug)
echo "WARNING: Debug flag set (--debug)"
set -x
shift
;;
--mail-host)
echo "Using $2 as mail backend ..."
OX_MAIL_HOST="$2"
shift
shift
;;
--mail-domain)
echo "Using $2 as mail domain ..."
OX_MAIL_DOMAIN="$2"
shift
shift
;;
--guard-endpoint)
echo "Using $2 as guard endpoint url ..."
OX_GUARD_ENDPOINT_URL="$2"
shift
shift
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift
;;
esac
done
set -- "${POSITIONAL[@]}" # restore positional parameters
echo "Using following configuration:"
set | grep "OX_GUARD"
echo "==============================="
sleep 5
# configure guard
setOXProperty com.openexchange.capability.guard true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.capability.guard-mail true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.capability.guard-drive true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.share.staticGuestCapabilities "guard" /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.guard.endpoint "${OX_GUARD_ENDPOINT_URL}" /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.rest.services.basic-auth.login "open-xchange" /opt/open-xchange/etc/server.properties
setOXProperty com.openexchange.rest.services.basic-auth.password "secret" /opt/open-xchange/etc/server.properties
# set guard config
# TODO:
setOXProperty com.openexchange.guard.oxGuardDatabaseHostname "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.oxGuardShardDatabase "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.databaseUsername "${OX_CONFIGDB_USER}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.databasePassword "${OX_CONFIGDB_PASS}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.restApiHostname "frontend" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.supportApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.supportApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.restApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.restApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.oxBackendPort 80 /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.oxBackendPath "/appsuite/api/" /opt/open-xchange/etc/guard-core.properties
# setup localhost config for sharing tests
# todo: guard external smtp config not hardcoded
setOXProperty com.openexchange.guard.externalReaderPath "localhost/guard/reader/reader.html" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.externalEmailURL "localhost" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPServer "${OX_MAIL_HOST}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPPort "25" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPUsername "noreply" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPPassword "secret" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPMailFrom "noreply@${OX_MAIL_DOMAIN}" /opt/open-xchange/etc/guard-core.properties
restartService open-xchange
sleep 10
waitPort localhost 8009
/opt/open-xchange/sbin/guard --directory /opt/open-xchange/etc --init
restartService open-xchange
echo "$(date)" >> /opt/open-xchange/etc/99-init-guard-done
\ No newline at end of file
# #!/bin/bash
# #
# # Copyright (C) 2019 OX Software GmbH
# #
# # This file is part of OX Automation.
# #
# # OX Automation is free software: you can redistribute it and/or modify
# # it under the terms of the GNU General Public License as published by
# # the Free Software Foundation, either version 3 of the License, or
# # (at your option) any later version.
# #
# # OX Automation is distributed in the hope that it will be useful,
# # but WITHOUT ANY WARRANTY; without even the implied warranty of
# # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# #
# # See the GNU General Public License for more details.
# #
# # You should have received a copy of the GNU General Public License
# # along with OX Automation. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# # Authors:
# # Benedikt Kroening <benedikt.kroening@open-xchange.com>
# #
# set -e
# SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P)"
# # sourcing some commonly used functions and executing basic checks
# source ${SCRIPT_DIR}/../lib/common.bash
# checkRootPrivileges
# detectDistribution
# # sourcing the default configuration to use
# # source ${SCRIPT_DIR}/config
# OX_GUARD_ENDPOINT_URL="http://localhost:8009/guardadmin"
# ## Help text
# show_usage() {
# echo -n "
# $0 [OPTIONS]
# "
# }
# ### reading config from command line; overriding defaults
# POSITIONAL=()
# while [[ $# -gt 0 ]]
# do
# key="$1"
# case $key in
# -h|--help)
# show_usage
# exit 0
# shift
# ;;
# --debug)
# echo "WARNING: Debug flag set (--debug)"
# set -x
# shift
# ;;
# --mail-host)
# echo "Using $2 as mail backend ..."
# OX_MAIL_HOST="$2"
# shift
# shift
# ;;
# --mail-domain)
# echo "Using $2 as mail domain ..."
# OX_MAIL_DOMAIN="$2"
# shift
# shift
# ;;
# --guard-endpoint)
# echo "Using $2 as guard endpoint url ..."
# OX_GUARD_ENDPOINT_URL="$2"
# shift
# shift
# ;;
# *) # unknown option
# POSITIONAL+=("$1") # save it in an array for later
# shift
# ;;
# esac
# done
# set -- "${POSITIONAL[@]}" # restore positional parameters
# echo "Using following configuration:"
# set | grep "OX_GUARD"
# echo "==============================="
# sleep 5
# # configure guard
# setOXProperty com.openexchange.capability.guard true /opt/open-xchange/etc/guard-api.properties
# setOXProperty com.openexchange.capability.guard-mail true /opt/open-xchange/etc/guard-api.properties
# setOXProperty com.openexchange.capability.guard-drive true /opt/open-xchange/etc/guard-api.properties
# setOXProperty com.openexchange.share.staticGuestCapabilities "guard" /opt/open-xchange/etc/guard-api.properties
# setOXProperty com.openexchange.guard.endpoint "${OX_GUARD_ENDPOINT_URL}" /opt/open-xchange/etc/guard-api.properties
# setOXProperty com.openexchange.rest.services.basic-auth.login "open-xchange" /opt/open-xchange/etc/server.properties
# setOXProperty com.openexchange.rest.services.basic-auth.password "secret" /opt/open-xchange/etc/server.properties
# # set guard config
# # TODO:
# setOXProperty com.openexchange.guard.oxGuardDatabaseHostname "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.oxGuardShardDatabase "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.databaseUsername "${OX_CONFIGDB_USER}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.databasePassword "${OX_CONFIGDB_PASS}" /opt/open-xchange/etc/guard-core.properties
# # setOXProperty com.openexchange.guard.restApiHostname "frontend" /opt/open-xchange/etc/guard-core.properties
# # setOXProperty com.openexchange.guard.supportApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
# # setOXProperty com.openexchange.guard.supportApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.restApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.restApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
# # setOXProperty com.openexchange.guard.oxBackendPort 80 /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.oxBackendPath "/appsuite/api/" /opt/open-xchange/etc/guard-core.properties
# # setup localhost config for sharing tests
# # todo: guard external smtp config not hardcoded
# setOXProperty com.openexchange.guard.externalReaderPath "localhost/guard/reader/reader.html" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.externalEmailURL "localhost" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.guestSMTPServer "${OX_MAIL_HOST}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.guestSMTPPort "25" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.guestSMTPUsername "noreply" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.guestSMTPPassword "secret" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.guestSMTPMailFrom "noreply@${OX_MAIL_DOMAIN}" /opt/open-xchange/etc/guard-core.properties
# restartService open-xchange
# sleep 10
# waitPort localhost 8009
# /opt/open-xchange/sbin/guard --directory /opt/open-xchange/etc --init
# restartService open-xchange
# echo "$(date)" >> /opt/open-xchange/etc/99-init-guard-done
\ No newline at end of file
#!/bin/bash
#
# Copyright (C) 2019 OX Software GmbH
#
# This file is part of OX Automation.
#
# OX Automation is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# OX Automation is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
#
# See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OX Automation. If not, see <http://www.gnu.org/licenses/>.
#
#
# Authors:
# Benedikt Kroening <benedikt.kroening@open-xchange.com>
#
set -e
SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P)"
# Default value, override globally for cluster envs
if [[ -z "${OX_GUARD_ENDPOINT_URL}" ]]; then
OX_GUARD_ENDPOINT_URL="http://localhost:8009/guardadmin"
fi
# sourcing some commonly used functions and executing basic checks
source ${SCRIPT_DIR}/../../lib/common.bash
checkRootPrivileges
detectDistribution
# sourcing the default configuration to use
# source ${SCRIPT_DIR}/config
## Help text
show_usage() {
echo -n "
$0 [OPTIONS]
"
}
### reading config from command line; overriding defaults
POSITIONAL=()
while [[ $# -gt 0 ]]
do
key="$1"
case $key in
-h|--help)
show_usage
exit 0
shift
;;
--debug)
echo "WARNING: Debug flag set (--debug)"
set -x
shift
;;
--guard-endpoint)
echo "Using $2 as guard endpoint url ..."
OX_GUARD_ENDPOINT_URL="$2"
shift
shift
;;
*) # unknown option
POSITIONAL+=("$1") # save it in an array for later
shift
;;
esac
done
set -- "${POSITIONAL[@]}" # restore positional parameters
if [ "${INSTALL_GUARD}" = false ]; then
echo "Skipping init script for guard"
exit 0
fi
INIT_STATE_FILE="/opt/open-xchange/etc/22-init-guard-done"
if [ ! -f ${INIT_STATE_FILE} ]; then
echo "Using following configuration:"
set | grep "OX_GUARD"
echo "==============================="
sleep 5
# configure guard
setOXProperty com.openexchange.capability.guard true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.capability.guard-mail true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.capability.guard-drive true /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.share.staticGuestCapabilities "guard" /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.guard.endpoint "${OX_GUARD_ENDPOINT_URL}" /opt/open-xchange/etc/guard-api.properties
setOXProperty com.openexchange.rest.services.basic-auth.login "open-xchange" /opt/open-xchange/etc/server.properties
setOXProperty com.openexchange.rest.services.basic-auth.password "secret" /opt/open-xchange/etc/server.properties
# set guard config
# TODO:
setOXProperty com.openexchange.guard.oxGuardDatabaseHostname "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.oxGuardShardDatabase "${DATABASE_HOST_NAME}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.databaseUsername "${OX_CONFIGDB_USER}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.databasePassword "${OX_CONFIGDB_PASS}" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.restApiHostname "frontend" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.supportApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.supportApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.restApiUsername "open-xchange" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.restApiPassword "secret" /opt/open-xchange/etc/guard-core.properties
# setOXProperty com.openexchange.guard.oxBackendPort 80 /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.oxBackendPath "/appsuite/api/" /opt/open-xchange/etc/guard-core.properties
# setup localhost config for sharing tests
# todo: guard external smtp config not hardcoded
setOXProperty com.openexchange.guard.externalReaderPath "localhost/guard/reader/reader.html" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.externalEmailURL "localhost" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPServer "${OX_MAIL_HOST}" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPPort "25" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPUsername "noreply" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPPassword "secret" /opt/open-xchange/etc/guard-core.properties
setOXProperty com.openexchange.guard.guestSMTPMailFrom "noreply@${OX_MAIL_DOMAIN}" /opt/open-xchange/etc/guard-core.properties
restartService open-xchange
sleep 10
waitPort localhost 8009
/opt/open-xchange/sbin/guard --directory /opt/open-xchange/etc --init
restartService open-xchange
echo "$(date)" >> ${INIT_STATE_FILE}
else
echo "WARNING: This scripts has already been executed and will be skipped!"
sleep 5
fi
restartService open-xchange
echo "Documents init finished at: "
cat ${INIT_STATE_FILE}
\ No newline at end of file
......@@ -35,9 +35,9 @@ services:
restart: always
networks:
- internal-net
middleware:
image: middleware:latest
singlenode:
image: singlenode:latest
env_file: docker/config
depends_on:
- database
volumes: # for quick testing you may want to export the middleware nodes etc directory
......@@ -49,8 +49,55 @@ services:
networks:
- internal-net
dovecot:
# Very simple dovecot instance with static-passdb
image: "gitlab.open-xchange.com:4567/docker/infrastructure/dovecot-backend:master"
environment:
- MAIL_DOMAIN=docker.qa.open-xchange.com
- ENV_SUBNET=172.30.0.0/16
- MAIL_DEBUG_LOG=0
volumes:
- "${PWD}/.runtime/home/vmail:/home/vmail"
networks:
- "internal-net"
restart: always
test-container:
image: 'gitlab.open-xchange.com:4567/docker/infrastructure/testing-codecept:develop'
environment:
- OX_ENV_UI_TESTING_ENABLED=1
- OX_ENV_UI_TESTING_AUTOSTART=0
- OX_ENV_UI_TESTING_CONFIG_MXDOMAIN=docker.qa.open-xchange.com
- OX_ENV_UI_TESTING_CONFIG_CONTEXTID=1337
- OX_ENV_UI_TESTING_GREP=C7336
- ENV_TESTING_IMAGE_TAG=develop
- ENV_SELENIUM_HOST=selenium-chrome-develop
- ENV_SELENIUM_IMAGE_TAG=develop
- OX_TESTING_POSTMAN_ENABLE=false
- OX_ENV_UI_TESTING_MULTIPLE_ENABLED=0
- OX_ENV_UI_TESTING_MULTIPLE_CHUNKS=50
- OX_ENV_UI_TESTING_REPO_BRANCH=develop
volumes:
- "${PWD}/test-results/codeceptjs:/opt/open-xchange/tests/results/codeceptjs"
- "${PWD}/test-results/postman:/opt/open-xchange/tests/results/postman"
networks:
- internal-net
selenium-chrome:
image: selenium/standalone-chrome:3.141.59-titanium
hostname: selenium-chrome-develop
container_name: selenium-chrome-develop
tmpfs:
- /var/run
- /var/cache
#- /opt/google
volumes:
- /dev/shm:/dev/shm
networks:
- internal-net
networks:
internal-net:
ipam:
config:
- subnet: 172.30.0.0/16
#!/bin/bash
SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P)"
pushd ${SCRIPT_DIR}/..
docker build --no-cache --rm -f docker/singlenode.dockerfile -t singlenode:latest .
popd
\ No newline at end of file
# This file contains docker configuration.
# It uses a seperate database and mailserver host.
# You have to take care that those hosts are available (see docker-compose.yml)
# Mail configuration
OX_MAIL_HOST=dovecot
OX_MAIL_DOMAIN=docker.qa.open-xchange.com
# Noreply specific settings
OX_ENV_NOREPLY_SERVER=${OX_MAIL_HOST}
OX_ENV_NOREPLY_ADDRESS=noreply@${OX_MAIL_DOMAIN}
OX_ENV_NOREPLY_LOGIN=${OX_ENV_NOREPLY_ADDRESS}
OX_ENV_NOREPLY_PASSWORD=secret
# Database specific configuration (currently external host with name "database" is used)
DATABASE_TYPE=mariadb
DATABASE_ROOT_USER=root
DATABASE_ROOT_PASS=secret
DATABASE_HOST_NAME=database
DATABASE_HOST_PORT=3306
# OX Backend specific configuration
OX_ADMINMASTER_USER=oxadminmaster
OX_ADMINMASTER_PASS=secret
OX_SERVER_NAME=singlenode
OX_CLUSTER_NAME=singlenode
OX_HAZELCAST_ENABLED=true
OX_CONFIGDB_USER=openexchange
OX_CONFIGDB_PASS=secret
OX_CONFIGDB_NAME=configdb
# Default setup settings
# This will install a basic singlenode setup
INSTALL_MIDDLEWARE=true
INSTALL_FRONTEND=true
INSTALL_GUARD=false
INSTALL_DOCUMENTS=false
INSTALL_DOCUMENTCONVERTER=false
INSTALL_DATABASE=false
INSTALL_DOVECOT=false
OX_ENV_QA=true
......@@ -52,17 +52,12 @@ ENV OX_ENV_QA=true
ENV INSTALL_FRONTEND=true
ENV INSTALL_MIDDLEWARE=true
ENV INSTALL_GUARD=true
ENV INSTALL_DOCUMENTS=true
ENV INSTALL_DOCUMENTS=false
ENV INSTALL_DOCUMENTCONVERTER=false
ENV INSTALL_DATABASE=false
#RUN source /ox-installer/lib/common.bash && installpackages netcat supervisor gnupg2 curl wget
# RUN apt-get update && apt-get install -y netcat supervisor gnupg2 curl wget
ENV INSTALL_TYPE=docker
ADD . /ox-installer
# Install frontend and middleware packages (including apache2)
RUN /ox-installer/ox-installer.sh --docker --frontend --middleware
RUN /ox-installer/ox-installer.sh --docker --config /ox-installer/docker/config
RUN chsh -s /bin/bash open-xchange && \
echo PATH=$PATH:/opt/open-xchange/sbin/ >> ~/.bashrc && \
mkdir /var/run/apache2 && \
......
......@@ -34,7 +34,7 @@ function restartService {
fi
else
#echo "ERROR: Not possible to determine installation type, could not restart service $1"
supvervisorctl restart $1
supervisorctl restart $1
fi
......
......@@ -33,6 +33,8 @@ source ${SCRIPT_DIR}/lib/common.bash
source ${SCRIPT_DIR}/lib/setup.bash
# sourcing the default configuration to use
# This may be overriden by some argument below
# This config file will still be loaded to provide defaults
exportProperties ${SCRIPT_DIR}/config/config
exportProperties ${SCRIPT_DIR}/setup/versions
......@@ -63,14 +65,12 @@ Easiest way to get a working OX App Suite this:
Configuration options:
--init This will start configuration scripts after component installation
--config <file> Configuration file to load
Examples:
Singlenode setup with everything you need:
$ ./ox-installer.sh --singlenode --dovecot
Docker middleware container:
$ ./ox-installer.sh --docker --middleware
"
}
......@@ -135,16 +135,23 @@ case $key in
;;
--docker)
export INSTALL_TYPE=docker
export INIT=false
shift
;;
--build-docker)
export INSTALL_TYPE=build_docker
shift
;;
# --build-docker)
# export INSTALL_TYPE=build_docker
# export INIT=false
# shift