From 26bb9d12b1c35fc69dc2408d09bc824cf789e70a Mon Sep 17 00:00:00 2001 From: Andrey Arapov Date: Wed, 4 Jul 2018 10:53:02 +0200 Subject: [PATCH] fixes --- Dockerfile | 1 + README.md | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1a97d1c..3486140 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ RUN apt-get -fy --no-install-recommends install RUN useradd -u 1000 -m -d /home/user -s /usr/sbin/nologin -g video user +ENV HOME /home/user WORKDIR /home/user VOLUME [ "/tmp" ] USER user diff --git a/README.md b/README.md index 2916488..c656531 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ ``` git clone https://github.com/arno01/hipchat.git cd hipchat +mkdir data docker-compose run -d ``` @@ -21,9 +22,14 @@ Place the following to your ~/.bash_aliases After that you can issue `hipchat` command ``` -alias docker="sudo -E docker" -alias docker-compose="sudo -E docker-compose" +function docker_helper() { + pushd ~/git/github/$1 + docker-compose rm -f "$1" + docker-compose run -u $(id -u):$(id -g) -d --name "$1" "$@" + popd +} -function docker_helper() { { pushd ~/docker/$1; docker-compose rm -fa "$1"; docker-compose run -d --name "$1" "$@"; popd; } } -function hipchat() { { docker_helper $FUNCNAME $@; } } +function hipchat() { + docker_helper "$FUNCNAME" "$@" +} ```