🐛 restore develop image build

This commit is contained in:
mathieu.brunot 2019-02-20 05:58:25 +01:00
parent 4e636ba51f
commit 2f41011160
No known key found for this signature in database
GPG key ID: 81584BEAF692D7E0
2 changed files with 8 additions and 7 deletions

View file

@ -11,7 +11,8 @@ tmux send-keys -t uxbox 'npm run figwheel' enter
tmux new-window -t uxbox:2 -n 'backend' tmux new-window -t uxbox:2 -n 'backend'
tmux select-window -t uxbox:2 tmux select-window -t uxbox:2
tmux send-keys -t uxbox 'cd uxbox/backend' enter C-l 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 new-window -t uxbox:3 -n 'services'
tmux select-window -t uxbox:3 tmux select-window -t uxbox:3

View file

@ -5,7 +5,7 @@ REV=`git rev-parse --short HEAD`
IMGNAME="uxbox" IMGNAME="uxbox"
function kill_container { function kill_container {
echo "Cleaning development image..." echo "Cleaning development image $IMGNAME:$REV..."
if $(sudo docker ps | grep -q $IMGNAME); then if $(sudo docker ps | grep -q $IMGNAME); then
sudo docker ps | grep $IMGNAME | awk '{print $1}' | xargs --no-run-if-empty sudo docker kill sudo docker ps | grep $IMGNAME | awk '{print $1}' | xargs --no-run-if-empty sudo docker kill
fi fi
@ -13,8 +13,8 @@ function kill_container {
function build_image { function build_image {
kill_container kill_container
echo "Building development image..." echo "Building development image $IMGNAME:$REV..."
#sudo docker build --rm=true -t $IMGNAME:$REV docker/ sudo docker build --rm=true -t $IMGNAME:$REV docker/
} }
function run_image { function run_image {
@ -32,9 +32,9 @@ function run_image {
-v `pwd`:/home/uxbox/uxbox \ -v `pwd`:/home/uxbox/uxbox \
-v $HOME/.m2:/home/uxbox/.m2 \ -v $HOME/.m2:/home/uxbox/.m2 \
-v $HOME/.gitconfig:/home/uxbox/.gitconfig \ -v $HOME/.gitconfig:/home/uxbox/.gitconfig \
-p 3449:3449 -p 6060:6060 -p 9090:9090 -p 3449:3449 -p 6060:6060 -p 9090:9090 \
$IMGNAME:develop $IMGNAME:$REV
#$IMGNAME:$REV #monogramm/uxbox:develop
} }
function test { function test {