From f452c5cffa9f22de96a703c29fb0ba99732bbeff Mon Sep 17 00:00:00 2001 From: Krzysztof Szumny Date: Sat, 22 Aug 2015 18:10:18 +0200 Subject: [PATCH] fix for envs --- {{cookiecutter.repo_name}}/compose/debug/Dockerfile | 4 +--- {{cookiecutter.repo_name}}/compose/debug/entrypoint.sh | 1 + {{cookiecutter.repo_name}}/package.json | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.repo_name}}/compose/debug/Dockerfile b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile index 32b4a6675..3fc7910ff 100644 --- a/{{cookiecutter.repo_name}}/compose/debug/Dockerfile +++ b/{{cookiecutter.repo_name}}/compose/debug/Dockerfile @@ -1,9 +1,7 @@ FROM {{ cookiecutter.repo_name|replace('_', '') }}_django # Install setuptools, pip and OpenSSH -RUN \ - apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip python-setuptools python3-pip python3-setuptools openssh-server && \ +RUN DEBIAN_FRONTEND=noninteractive apt-get -y install python-pip python-setuptools python3-pip python3-setuptools openssh-server && \ rm -rf /var/lib/apt/lists/* # sshd needs this directory to run diff --git a/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh b/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh index 11851f6cc..48c979937 100755 --- a/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh +++ b/{{cookiecutter.repo_name}}/compose/debug/entrypoint.sh @@ -7,6 +7,7 @@ USER=docker_{{ cookiecutter.repo_name }} # rename django username to docker_{{ cookiecutter.repo_name }} usermod -l $USER -m -d /home/$USER django groupmod -n $USER django +sed -i "s/django/$USER/g" /tmp/environment mkdir /home/$USER/.ssh cat /app/compose/debug/keys_to_docker/id_rsa.pub > /home/$USER/.ssh/authorized_keys diff --git a/{{cookiecutter.repo_name}}/package.json b/{{cookiecutter.repo_name}}/package.json index c5846fd73..bf85efb93 100644 --- a/{{cookiecutter.repo_name}}/package.json +++ b/{{cookiecutter.repo_name}}/package.json @@ -4,6 +4,7 @@ "dependencies": {}, "devDependencies": { "grunt": "~0.4.5", + "grunt-cli": "^0.1.13", "grunt-contrib-watch": "~0.6.1", "grunt-bg-shell": "~2.3.1", "connect-livereload": "~0.3.2",