StarMirror/sol2
1
0
Fork 0
mirror of https://github.com/ThePhD/sol2.git synced 2024-03-22 13:10:44 +08:00
Code Issues Projects Releases Wiki Activity

use scripts from live, not what's pushed into the dockerfile

Browse Source
This commit is contained in:
ThePhD 2018-01-08 12:45:12 -05:00
parent d45daccc8a
commit 81b2e1fc66
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.dockerignore
View File

@ -24,4 +24,5 @@
** **
# Except the script directory # Except the script directory
!scripts/ !scripts/preparation.*
!scripts/build.*

2
Dockerfile
View File

@ -63,4 +63,4 @@ RUN ["/usr/bin/env", "zsh", "-e", "/root/sol2-scripts/preparation.linux.sh"]
# gets "saved" in... # gets "saved" in...
# it only runs the last CMD/ENTRYPOINT as the default behavior: # it only runs the last CMD/ENTRYPOINT as the default behavior:
# multiple CMDs will not be respected # 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"]

4
scripts/run.linux.sh
View File

@ -23,7 +23,7 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
echo -en "travis_fold:start:build_preparation.1\r" echo -en "travis_fold:start:build_preparation.1\r"
if [ -z "${SOL2_DIR}"] if [ -z "${SOL2_DIR}" ]
then then
if [ ${CI} = true ] if [ ${CI} = true ]
then then
@ -33,7 +33,7 @@ echo -en "travis_fold:start:build_preparation.1\r"
fi fi
fi fi
if [ -z "${LUA_VERSION}"] if [ -z "${LUA_VERSION}" ]
then then
export LUA_VERSION=5.3.4 export LUA_VERSION=5.3.4
fi fi