From 81b2e1fc662a96ae2a9cdf3664cefaa70b829fcd Mon Sep 17 00:00:00 2001 From: ThePhD Date: Mon, 8 Jan 2018 12:45:12 -0500 Subject: [PATCH] use scripts from live, not what's pushed into the dockerfile --- .dockerignore | 3 ++- Dockerfile | 2 +- scripts/run.linux.sh | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.dockerignore b/.dockerignore index 71a71abb..23b38af1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -24,4 +24,5 @@ ** # Except the script directory -!scripts/ +!scripts/preparation.* +!scripts/build.* diff --git a/Dockerfile b/Dockerfile index d2252b0f..b3581ab8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,4 +63,4 @@ RUN ["/usr/bin/env", "zsh", "-e", "/root/sol2-scripts/preparation.linux.sh"] # gets "saved" in... # it only runs the last CMD/ENTRYPOINT as the default behavior: # multiple CMDs will not be respected -ENTRYPOINT ["/usr/bin/env", "zsh", "-e", "/root/sol2-scripts/run.linux.sh"] +ENTRYPOINT ["/usr/bin/env", "zsh", "-e", "/root/sol2/scripts/run.linux.sh"] diff --git a/scripts/run.linux.sh b/scripts/run.linux.sh index 8b4b4413..38588840 100644 --- a/scripts/run.linux.sh +++ b/scripts/run.linux.sh @@ -23,7 +23,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. echo -en "travis_fold:start:build_preparation.1\r" - if [ -z "${SOL2_DIR}"] + if [ -z "${SOL2_DIR}" ] then if [ ${CI} = true ] then @@ -33,7 +33,7 @@ echo -en "travis_fold:start:build_preparation.1\r" fi fi - if [ -z "${LUA_VERSION}"] + if [ -z "${LUA_VERSION}" ] then export LUA_VERSION=5.3.4 fi