Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
micafer committed Jun 18, 2015
2 parents b54ca74 + 3b09399 commit 4d01847
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 0 deletions.
11 changes: 11 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Dockerfile to create a container with the IM service
FROM ubuntu:14.04.2
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.3.0"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899
RUN apt-get update && apt-get install -y gcc python-dev python-pip python-soappy openssh-client sshpass
RUN pip install IM
RUN pip uninstall -y SOAPpy
COPY ansible.cfg /etc/ansible/ansible.cfg
CMD im_service.py
17 changes: 17 additions & 0 deletions docker/ansible.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[defaults]
transport = smart
host_key_checking = False
sudo_user = root
sudo_exe = sudo

[paramiko_connection]

record_host_keys=False

[ssh_connection]

# Only in systems with OpenSSH support to ControlPersist
ssh_args = -o ControlMaster=auto -o ControlPersist=900s
# In systems with older versions of OpenSSH (RHEL 6, CentOS 6, SLES 10 or SLES 11)
#ssh_args =
pipelining = True

0 comments on commit 4d01847

Please sign in to comment.