aboutsummaryrefslogtreecommitdiffstats
path: root/build-root/scripts/docker.sh
diff options
context:
space:
mode:
Diffstat (limited to 'build-root/scripts/docker.sh')
-rwxr-xr-xbuild-root/scripts/docker.sh45
1 files changed, 7 insertions, 38 deletions
diff --git a/build-root/scripts/docker.sh b/build-root/scripts/docker.sh
index 8ed872e..baa994c 100755
--- a/build-root/scripts/docker.sh
+++ b/build-root/scripts/docker.sh
@@ -14,45 +14,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+
IMAGE="sweetcomb_img"
CONTAINER="sweetcomb"
-function build_enviroment {
- FIND=`docker images | grep ${IMAGE}`
-
- if [ -n "${FIND}" ]; then
- return
- fi
-
- docker build -t ${IMAGE} ./src/Docker/Build
-}
-
-function create_container {
- docker run -id --privileged --name ${CONTAINER} \
- -v $(pwd)/../sweetcomb:/root/src/sweetcomb ${IMAGE}
-}
-
-function start_container {
- FIND=`docker container ls -a | grep ${CONTAINER}`
-
- if [ -z "${FIND}" ]; then
- create_container
- else
- FIND=`docker container ps | grep ${CONTAINER}`
- if [ -z "${FIND}" ]; then
- docker start ${CONTAINER}
- fi
- fi
-}
-
-function build_sweetcomb {
- docker exec -it ${CONTAINER} bash -c "/root/src/sweetcomb/build-root/scripts/de_build.sh"
-}
-
-function main {
- build_enviroment
- start_container
- build_sweetcomb
-}
+#Clean previous build: container and image
+docker rm ${CONTAINER} -f
+docker rmi ${IMAGE} -f
-main $@
+#Rebuild image and container
+docker build -t ${IMAGE} .
+docker run -id --privileged --name ${CONTAINER} ${IMAGE}