Skip to content

Commit

Permalink
Merge pull request #411 from grycap/devel
Browse files Browse the repository at this point in the history
Set version 1.6.1
  • Loading branch information
micafer authored Sep 20, 2017
2 parents ed46d56 + 1e76a63 commit 3a89aca
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion IM/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@
'InfrastructureInfo', 'InfrastructureManager', 'recipe', 'request', 'REST', 'retry',
'ServiceRequests', 'SSH', 'SSHRetry', 'timedcall', 'UnixHTTPConnection', 'uriparse',
'VirtualMachine', 'VMRC', 'xmlobject']
__version__ = '1.6.0'
__version__ = '1.6.1'
__author__ = 'Miguel Caballer'
5 changes: 5 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -329,3 +329,8 @@ IM 1.6.0
* Update Ansible roles in Master node in reconfiguration.
* Fix error in Azure conn creating subnet.
* Fix error in Context. process in basic test in SSH tests.

IM 1.6.1
* Fix error in ctxt process in some cases in OpenStack sites.
* Fix error launching IM with Ansible 2.4.0.

2 changes: 1 addition & 1 deletion docker-devel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile to create a container with the IM service
FROM grycap/jenkins:ubuntu16.04-im
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.6.0"
LABEL version="1.6.1"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"

EXPOSE 8899 8800
Expand Down
2 changes: 1 addition & 1 deletion docker-py3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile to create a container with the IM service with python 3
FROM ubuntu:16.04
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.6.0"
LABEL version="1.6.1"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im) with python 3"
EXPOSE 8899 8800
RUN apt-get update && apt-get install -y gcc python3-dbg python3-dev python3-pip libmysqld-dev openssh-client sshpass libssl-dev libffi-dev python3-requests python3-mysqldb
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Dockerfile to create a container with the IM service
FROM ubuntu:16.04
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.6.0"
LABEL version="1.6.1"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899 8800
# Install Ansible
Expand All @@ -23,7 +23,7 @@ RUN wget https://launchpad.net/ubuntu/+archive/primary/+files/python-msrest_0.4.

# Install IM
RUN wget https://github.com/grycap/RADL/releases/download/v1.1.0/python-radl_1.1.0-1_all.deb && \
wget https://github.com/grycap/im/releases/download/v1.6.0/python-im_1.6.0-1_all.deb && \
wget https://github.com/grycap/im/releases/download/v1.6.1/python-im_1.6.1-1_all.deb && \
dpkg -i python-radl_*_all.deb ; \
dpkg -i python-im_*_all.deb ; \
rm *.deb && \
Expand Down

0 comments on commit 3a89aca

Please sign in to comment.