Skip to content

Commit

Permalink
Merge pull request #721 from grycap/devel
Browse files Browse the repository at this point in the history
Fix dockerfile
  • Loading branch information
micafer authored Nov 21, 2018
2 parents 9cfc890 + 0ba5ff1 commit f86f233
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ RUN pip install setuptools pip --upgrade -I
RUN pip install pyOpenSSL --upgrade -I

# Install IM
RUN apt-get update && apt-get install --no-install-recommends -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev libmysqlclient20 && \
RUN apt-get update && apt-get install --no-install-recommends -y gcc git libmysqld-dev libssl-dev libffi-dev libsqlite3-dev libmysqlclient20 && \
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 && \
apt-get purge -y gcc libmysqld-dev libssl-dev libffi-dev libsqlite3-dev python-dev python-pip && \
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/

# Install pip optional libraries
Expand Down
3 changes: 3 additions & 0 deletions test/unit/REST.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,9 @@ def test_GetInfrastructureProperty(self, bottle_request, get_infrastructure, Get
res = RESTGetInfrastructureProperty("1", "radl")
self.assertEqual(res, "radl")

res = RESTGetInfrastructureProperty("1", "outputs")
self.assertEqual(res, '{"outputs": "outputs"}')

res = RESTGetInfrastructureProperty("1", "tosca")
self.assertEqual(res, "tosca")

Expand Down

0 comments on commit f86f233

Please sign in to comment.