From d8a029317823693024f941d791dfc4c7cd77dbab Mon Sep 17 00:00:00 2001 From: seefo Date: Thu, 11 Jan 2018 03:36:41 -0500 Subject: [PATCH] Finished initial automated building with docker --- .gitignore | 1 + .gitmodules | 7 ------- build_src.sh | 12 ++++++++++++ clone_repos.sh | 2 ++ src | 2 +- utils/build_docker.sh | 10 ++++++++++ utils/get_redist.sh | 19 +++++++++++++++++++ 7 files changed, 45 insertions(+), 8 deletions(-) delete mode 100644 .gitmodules create mode 100755 build_src.sh create mode 100755 clone_repos.sh create mode 100755 utils/build_docker.sh create mode 100755 utils/get_redist.sh diff --git a/.gitignore b/.gitignore index 2dc3fc3..c0d04b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ src/* dsrc/* server/* +.setup diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index f888085..0000000 --- a/.gitmodules +++ /dev/null @@ -1,7 +0,0 @@ -[submodule "src"] - path = src - url = https://bitbucket.org/seefoe/src.git - -[submodule "dsrc"] - path = dsrc - url = https://bitbucket.org/seefoe/dsrc.git diff --git a/build_src.sh b/build_src.sh new file mode 100755 index 0000000..fdb1b40 --- /dev/null +++ b/build_src.sh @@ -0,0 +1,12 @@ +#!/bin/bash +basedir=$PWD + +if [ ! -f $basedir/.setup ]; then + cd $basedir/src/ + $basedir/utils/get_redist.sh + $basedir/utils/build_docker.sh + touch $basedir/.setup +fi + +# run the docker image and build the source +docker run --mount source=swg-src,destination=/swg/ swg-compiler diff --git a/clone_repos.sh b/clone_repos.sh new file mode 100755 index 0000000..a02baca --- /dev/null +++ b/clone_repos.sh @@ -0,0 +1,2 @@ +git clone https://bitbucket.org/seefoe/src.git +git clone https://bitbucket.org/seefoe/dsrc.git diff --git a/src b/src index 6fe7df6..6320d8f 160000 --- a/src +++ b/src @@ -1 +1 @@ -Subproject commit 6fe7df696c8d6fdfd702b9b2ed65c6961eb06417 +Subproject commit 6320d8f6b627b88802755ffc55436ba17977d952 diff --git a/utils/build_docker.sh b/utils/build_docker.sh new file mode 100755 index 0000000..b7ac141 --- /dev/null +++ b/utils/build_docker.sh @@ -0,0 +1,10 @@ +# build the docker image from our dockerfile +docker build -t swg-compiler . + +# delete old symlink incase it already exists +rm /var/lib/docker/volumes/swg-src/_data + +# create docker volume and symlink to our src folder +docker volume create swg-src +rm -rf /var/lib/docker/volumes/swg-src/_data +ln -s $PWD/ /var/lib/docker/volumes/swg-src/_data diff --git a/utils/get_redist.sh b/utils/get_redist.sh new file mode 100755 index 0000000..003c67b --- /dev/null +++ b/utils/get_redist.sh @@ -0,0 +1,19 @@ +if [ ! -d "redist" ]; then + mkdir redist +fi + +if [ ! -f ./redist/oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm ]; then + wget https://bitbucket.org/seefoe/src/downloads/oracle-instantclient12.1-basic-12.1.0.2.0-1.i386.rpm -P ./redist/ +fi + +if [ ! -f ./redist/oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm ]; then + wget ./redist/ https://bitbucket.org/seefoe/src/downloads/oracle-instantclient12.1-devel-12.1.0.2.0-1.i386.rpm -P ./redist/ +fi + +if [ ! -f ./redist/oracle-instantclient12.1-sqlplus-12.1.0.2.0-1.i386.rpm ]; then + wget ./redist/ https://bitbucket.org/seefoe/src/downloads/oracle-instantclient12.1-sqlplus-12.1.0.2.0-1.i386.rpm -P ./redist/ +fi + +if [ ! -f ./redist/IBMJava2-SDK-1.4.2-13.18.tgz ]; then + wget ./redist/ https://bitbucket.org/seefoe/src/downloads/IBMJava2-SDK-1.4.2-13.18.tgz -P ./redist/ +fi