From 3ed3ee2b9424132703ac53514e599012f1aaecb5 Mon Sep 17 00:00:00 2001 From: Frieder Schlesier Date: Tue, 8 Mar 2016 10:37:50 +0100 Subject: [PATCH] add gimp & updates --- .dockerfunc | 17 ++++++++++++++--- install.sh | 7 +------ 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.dockerfunc b/.dockerfunc index 073cf84..dcc739f 100755 --- a/.dockerfunc +++ b/.dockerfunc @@ -91,12 +91,23 @@ eclipse() { exit 0; } +gimp() { + del_stopped gimp + + docker run -d \ + -v /etc/localtime:/etc/localtime:ro \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + -e DISPLAY=unix$DISPLAY \ + -v $HOME/Pictures:/root/Pictures \ + --name gimp \ + fschl/gimp +} + go() { - docker run -it --rm \ - -e GO15VENDOREXPERIMENT=1 \ + docker run -i --rm \ -v "$PWD":/usr/src/myapp \ -w /usr/src/myapp \ - golang:1.5 go "$@" + fschl/golang-dev:latest go "$@" } diff --git a/install.sh b/install.sh index 7a7dcd0..bf38d57 100755 --- a/install.sh +++ b/install.sh @@ -93,14 +93,9 @@ install_docker() { get_dotfiles() { ( - cd "/home$USERNAME" - git clone https://github.com/fschl/dotfiles.git "/home/$USERNAME/dotfiles" - cd "/home/$USERNAME/dotfiles" + cd "/home/$USERNAME/dotfiles" && make - make - - cd "/home/$USERNAME" git clone https://github.com/fschl/dockerfiles.git "/home/$USERNAME/dockerfiles" git clone https://github.com/fschl/.emacs.d.git "/home/$USERNAME/.emacs.d"