From 2f41011160823304d53e7f04bc12b73045c9339e Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Wed, 20 Feb 2019 05:58:25 +0100 Subject: [PATCH] :bug: restore develop image build --- docker/files/start.sh | 3 ++- manage.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/docker/files/start.sh b/docker/files/start.sh index 156d787e0..42c3f9b19 100755 --- a/docker/files/start.sh +++ b/docker/files/start.sh @@ -11,7 +11,8 @@ tmux send-keys -t uxbox 'npm run figwheel' enter tmux new-window -t uxbox:2 -n 'backend' tmux select-window -t uxbox:2 tmux send-keys -t uxbox 'cd uxbox/backend' enter C-l -tmux send-keys -t uxbox 'bash ./scripts/fixtures.sh' enter +tmux send-keys -t uxbox 'bash ./scripts/fixtures.sh' enter C-l +tmux send-keys -t uxbox 'bash ./scripts/run.sh' enter tmux new-window -t uxbox:3 -n 'services' tmux select-window -t uxbox:3 diff --git a/manage.sh b/manage.sh index e2765ada9..d2a3adb21 100755 --- a/manage.sh +++ b/manage.sh @@ -5,7 +5,7 @@ REV=`git rev-parse --short HEAD` IMGNAME="uxbox" function kill_container { - echo "Cleaning development image..." + echo "Cleaning development image $IMGNAME:$REV..." if $(sudo docker ps | grep -q $IMGNAME); then sudo docker ps | grep $IMGNAME | awk '{print $1}' | xargs --no-run-if-empty sudo docker kill fi @@ -13,8 +13,8 @@ function kill_container { function build_image { kill_container - echo "Building development image..." - #sudo docker build --rm=true -t $IMGNAME:$REV docker/ + echo "Building development image $IMGNAME:$REV..." + sudo docker build --rm=true -t $IMGNAME:$REV docker/ } function run_image { @@ -32,9 +32,9 @@ function run_image { -v `pwd`:/home/uxbox/uxbox \ -v $HOME/.m2:/home/uxbox/.m2 \ -v $HOME/.gitconfig:/home/uxbox/.gitconfig \ - -p 3449:3449 -p 6060:6060 -p 9090:9090 - $IMGNAME:develop - #$IMGNAME:$REV + -p 3449:3449 -p 6060:6060 -p 9090:9090 \ + $IMGNAME:$REV + #monogramm/uxbox:develop } function test {