From 6fe09bf78491b62726b50a428f8c0ed4721f310e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 29 Jan 2017 14:26:38 +0100 Subject: [PATCH] Minor fixes on dockerfile and manage.sh script. --- docker/Dockerfile | 4 ---- docker/files/lein | 2 +- manage.sh | 23 ----------------------- 3 files changed, 1 insertion(+), 28 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 569470299..0185a05b0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -51,10 +51,6 @@ RUN wget http://mirror.checkdomain.de/imagemagick/releases/ImageMagick-7.0.4-6.t cd .. && \ rm -rf ./ImageMagick-7.0.4-6.tar.xz ./ImageMagick-7.0.4-6 -RUN wget http://www.imagemagick.org/download/ImageMagick.tar.gz -RUN tar xvf ImageMagick.tar.gz -RUN cd ImageMagick-* && ./configure --prefix=/opt/img && make && make install && cd .. - EXPOSE 3449 EXPOSE 6060 EXPOSE 9090 diff --git a/docker/files/lein b/docker/files/lein index 105c682ed..01909f981 100755 --- a/docker/files/lein +++ b/docker/files/lein @@ -4,7 +4,7 @@ # somewhere on your $PATH, like ~/bin. The rest of Leiningen will be # installed upon first run into the ~/.lein/self-installs directory. -export LEIN_VERSION="2.6.1" +export LEIN_VERSION="2.7.1" case $LEIN_VERSION in *SNAPSHOT) SNAPSHOT="YES" ;; diff --git a/manage.sh b/manage.sh index ee3757cf1..8b8683557 100755 --- a/manage.sh +++ b/manage.sh @@ -9,29 +9,6 @@ function kill_container { fi } -function start_local { - tmux -2 new-session -d -s uxbox - - tmux new-window -t uxbox:1 -n 'figwheel' - tmux select-window -t uxbox:1 - tmux send-keys -t uxbox 'cd frontend' enter - 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 backend' enter - # tmux send-keys -t uxbox 'bash ./scripts/fixtures.sh' enter - # tmux send-keys -t uxbox 'bash ./scripts/run.sh' enter - - tmux rename-window -t uxbox:0 'gulp' - tmux select-window -t uxbox:0 - tmux send-keys -t uxbox 'cd frontend' enter - tmux send-keys -t uxbox 'if [ ! -e ./node_modules ]; then npm install; fi' enter - tmux send-keys -t uxbox 'npm run watch' enter - - tmux -2 attach-session -t uxbox -} - function build_image { kill_container sudo docker build --rm=true -t $IMGNAME:$REV docker/