From 7ba644589804b62d15f7b6fc05c1b8c549b79bed Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 12 Jun 2015 11:39:30 -0400 Subject: [PATCH 1/2] added ssh to docker env --- tools/docker/Dockerfile | 2 +- tools/docker/start_development.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 5d842f35b3..5129632d94 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -10,7 +10,7 @@ RUN add-apt-repository -y ppa:chris-lea/redis-server; add-apt-repository -y ppa: RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10 RUN echo "deb http://repo.mongodb.org/apt/ubuntu "$(lsb_release -sc)"/mongodb-org/3.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.0.list RUN apt-get update -RUN apt-get install -y ansible mg vim tmux git mercurial subversion python-dev python-pip libyaml-dev python-yaml python-paramiko python-jinja2 make postgresql python-psycopg2 python-ldap nodejs redis-server python-gevent libzmq3 python-zmq python-netifaces mongodb-org python-psutil && rm -rf /var/lib/apt/lists/* +RUN apt-get install -y openssh-server ansible mg vim tmux git mercurial subversion python-dev python-pip libyaml-dev python-yaml python-paramiko python-jinja2 make postgresql python-psycopg2 python-ldap nodejs redis-server python-gevent libzmq3 python-zmq python-netifaces mongodb-org python-psutil && rm -rf /var/lib/apt/lists/* RUN git clone http://d7f73f8614295715a4777bf15f46d0d486ad0e21:x-oauth-basic@github.com/ansible/ansible-commander.git tower RUN pip install Django==1.6.7 django-devserver django-debug-toolbar django-jenkins ipython pymongo==2.8 mongoengine RUN cd /tower ; make develop diff --git a/tools/docker/start_development.sh b/tools/docker/start_development.sh index bf0cc0ae88..76dd93913e 100755 --- a/tools/docker/start_development.sh +++ b/tools/docker/start_development.sh @@ -1,5 +1,6 @@ #!/bin/bash +/etc/init.d/ssh start /etc/init.d/postgresql start /etc/init.d/redis-server start nohup mongod & From 26f5122179683fa38c912f1da4d68c2d9f16fe5e Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Fri, 12 Jun 2015 11:46:29 -0400 Subject: [PATCH 2/2] expose ssh via 2222 --- tools/docker/Dockerfile | 2 +- tools/docker/README | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 5129632d94..9ba49056ea 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -26,5 +26,5 @@ RUN /etc/init.d/postgresql start; cd /tower ; make migrate ; make init ; /etc/in ADD start_everything.sh /start_everything.sh ADD start_development.sh /start_development.sh -EXPOSE 8013 8080 27017 +EXPOSE 8013 8080 27017 22 CMD /start_development.sh diff --git a/tools/docker/README b/tools/docker/README index 32b60e4ec6..81fcf0cbdc 100644 --- a/tools/docker/README +++ b/tools/docker/README @@ -1,2 +1,2 @@ sudo docker build --no-cache=true --rm=true -t ansible/tower_devel:latest . -sudo docker run --name tower_test -it --memory="4g" --cpuset="0,1" -v /home/meyers/ansible/:/tower_devel -p 8013:8013 -p 8080:8080 -p 27017:27017 ansible/tower_devel +sudo docker run --name tower_test -it --memory="4g" --cpuset="0,1" -v /home/meyers/ansible/:/tower_devel -p 8013:8013 -p 8080:8080 -p 27017:27017 -p 2222:22 ansible/tower_devel