Skip to content
This repository has been archived by the owner on Jul 28, 2023. It is now read-only.

Commit

Permalink
Merge pull request #234 from indigo-dc/devel
Browse files Browse the repository at this point in the history
Devel
  • Loading branch information
micafer authored May 21, 2018
2 parents 0971a2b + da152e6 commit d6a8547
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 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', 'UnixHTTPAdapter', 'uriparse',
'VirtualMachine', 'VMRC', 'xmlobject']
__version__ = '1.7.1'
__version__ = '1.7.2'
__author__ = 'Miguel Caballer'
4 changes: 4 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -412,3 +412,7 @@ IM 1.7.1:
* Fix problems with nodes with IPv6 in OpenStack conn.
* Fix Azure conn does not get the correct state (in case of suspended VMs).
* Enable to specify pool_name in the network provider_ip in OpenStack conn.

IM 1.7.2:
* Fix Error setting the INF_CACHE_TIME conf variable time.
* Add support to availability_zone in tosca.policies.Placement.
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.7.1"
LABEL version="1.7.2"
LABEL description="Container image to run the IM service with TOSCA support. (http://www.grycap.upv.es/im)"

# Install tosca-parser
Expand Down
4 changes: 2 additions & 2 deletions 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
FROM ubuntu:16.04
LABEL maintainer="Miguel Caballer <[email protected]>"
LABEL version="1.7.1"
LABEL version="1.7.2"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899 8800

Expand All @@ -16,7 +16,7 @@ RUN pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-c

# Install IM
RUN apt-get update && apt-get install --no-install-recommends -y gcc libssl-dev libffi-dev libsqlite3-dev && \
pip3 install IM==1.6.1 && \
pip3 install IM==1.7.2 && \
apt-get remove -y gcc libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
apt-get autoremove -y && \
rm -rf /var/lib/apt/lists/*
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 and TOSCA support
FROM ubuntu:16.04
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.7.1"
LABEL version="1.7.2"
LABEL description="Container image to run the IM service with TOSCA support. (http://www.grycap.upv.es/im)"

# 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/indigo-dc/im/releases/download/v1.7.1/python-im_1.7.1-1_all.deb && \
wget https://github.com/indigo-dc/im/releases/download/v1.7.2/python-im_1.7.2-1_all.deb && \
wget https://github.com/indigo-dc/tosca-parser/releases/download/0.9.1/python-tosca-parser_0.9.1-1_all.deb && \
dpkg -i python-radl_*_all.deb ; \
dpkg -i python-tosca-parser_*_all.deb ; \
Expand Down

0 comments on commit d6a8547

Please sign in to comment.