diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9164aa2..1503aab 100644 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,11 +1,14 @@ #!/bin/bash -if [ ! -f entrypoint.config ]; then - echo "entrypoint.config not found! create it from entrypoint.config.dist before running this script!" - exit 1 -fi - -. entrypoint.config +ZAMMAD_DIR="/home/zammad" +GIT_URL="https://github.com/zammad/zammad.git" +GIT_BRANCH="develop" +#GIT_URL="https://github.com/monotek/zammad.git" +#GIT_BRANCH="unicorn" +FRESH_INSTALL="no" +RAILS_SERVER="puma" +DEBUG="no" +RAILS_ENV="production" export RAILS_ENV=${RAILS_ENV} diff --git a/entrypoint.config b/entrypoint.config deleted file mode 100644 index 5876f4f..0000000 --- a/entrypoint.config +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -ZAMMAD_DIR="/home/zammad" -GIT_URL="https://github.com/monotek/zammad.git" -GIT_BRANCH="unicorn" -FRESH_INSTALL="no" -RAILS_SERVER="unicorn" -DEBUG="no" -RAILS_ENV="production" diff --git a/entrypoint.config.dist b/entrypoint.config.dist deleted file mode 100644 index 8b7b6c0..0000000 --- a/entrypoint.config.dist +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -ZAMMAD_DIR="/home/zammad" -GIT_URL="https://github.com/zammad/zammad.git" -GIT_BRANCH="develop" -FRESH_INSTALL="no" -RAILS_SERVER="puma" -DEBUG="no" -RAILS_ENV="production"