Skip to content

Commit

Permalink
Merge pull request #741 from grycap/devel
Browse files Browse the repository at this point in the history
Set version 1.7.7
  • Loading branch information
micafer authored Dec 19, 2018
2 parents 3d16455 + 594ecaa commit 0bbebfc
Show file tree
Hide file tree
Showing 5 changed files with 12 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.6'
__version__ = '1.7.7'
__author__ = 'Miguel Caballer'
6 changes: 6 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -458,3 +458,9 @@ IM 1.7.6:
* Update Azure conn to new Auth methods: #589
* Enable to open ports in SG in private nets in TOSCA: #687
* Enable to link a VM with an existing disk in Azure conn: #590

IM 1.7.7:
* Enhance public network detection in OCCI conn.
* Add support of Federated networks in FogBow conn.
* Improve token check in OCCI conn.
* Fix created volumes are not deleted in EC2 conn.
2 changes: 1 addition & 1 deletion docker-devel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
FROM grycap/jenkins:ubuntu16.04-im
ARG BRANCH=devel
MAINTAINER Miguel Caballer <[email protected]>
LABEL version="1.7.6"
LABEL version="1.7.7"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"

EXPOSE 8899 8800
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.6"
LABEL version="1.7.7"
LABEL description="Container image to run the IM service. (http://www.grycap.upv.es/im)"
EXPOSE 8899 8800

Expand All @@ -18,7 +18,7 @@ RUN pip3 install msrest msrestazure azure-common azure-mgmt-storage azure-mgmt-c
RUN apt-get update && apt-get install --no-install-recommends -y gcc libssl-dev libffi-dev libsqlite3-dev && \
pip install pycrypto && \
cd /tmp && git clone https://github.com/indigo-dc/tosca-parser && pip install /tmp/tosca-parser && \
pip3 install IM==1.7.6 && \
pip3 install IM==1.7.7 && \
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
FROM ubuntu:18.04
LABEL maintainer="Miguel Caballer <[email protected]>"
LABEL version="1.7.6"
LABEL version="1.7.7"
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 apt-get update && apt-get install --no-install-recommends -y gcc git libmysq
pip install pycrypto && \
pip install MySQL-python && \
cd /tmp && git clone https://github.com/indigo-dc/tosca-parser && pip install /tmp/tosca-parser && \
pip install IM==1.7.6 && \
pip install IM==1.7.7 && \
apt-get purge -y gcc git libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && rm -rf ~/.cache/

Expand Down

0 comments on commit 0bbebfc

Please sign in to comment.