summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-01 09:46:54 +0000
committerGerrit Code Review <review@openstack.org>2018-08-01 09:46:54 +0000
commit4625c85aca827792781abb82890ee98346da70df (patch)
tree646496d6b75ace9f2510ce36914c583622e3dc3a
parent12081eb94ace0b6810718eccc8621c9240fc6713 (diff)
parente4694009d9bb54aa8f3aed924f192c9e08b7e06a (diff)
Merge "Fix docker image not building"
-rw-r--r--tools/docker/DOCKER_README.rst8
-rw-r--r--tools/docker/Dockerfile4
2 files changed, 11 insertions, 1 deletions
diff --git a/tools/docker/DOCKER_README.rst b/tools/docker/DOCKER_README.rst
index 6469e5b..97359f0 100644
--- a/tools/docker/DOCKER_README.rst
+++ b/tools/docker/DOCKER_README.rst
@@ -63,6 +63,14 @@ for example::
63 -f tools/docker/docker-compose/mistral-single-node.yaml \ 63 -f tools/docker/docker-compose/mistral-single-node.yaml \
64 -p mistral up -d --build 64 -p mistral up -d --build
65 65
66Running the Mistral client from the Docker Compose container
67------------------------------------------------------------
68
69To run the mistral client against the server in the container using the client
70present in the container::
71
72 docker run -it mistral_mistral mistral workflow-list
73
66Configuring Mistral 74Configuring Mistral
67------------------- 75-------------------
68 76
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 979341b..53b49ac 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -8,6 +8,7 @@ LABEL name="Mistral" \
8RUN apt-get -qq update && \ 8RUN apt-get -qq update && \
9 apt-get install -y \ 9 apt-get install -y \
10 libffi-dev \ 10 libffi-dev \
11 libpq-dev \
11 libssl-dev \ 12 libssl-dev \
12 libxml2-dev \ 13 libxml2-dev \
13 libxslt1-dev \ 14 libxslt1-dev \
@@ -22,7 +23,8 @@ RUN apt-get -qq update && \
22 libuv1 \ 23 libuv1 \
23 libuv1-dev && \ 24 libuv1-dev && \
24 curl -f -o /tmp/get-pip.py https://bootstrap.pypa.io/3.2/get-pip.py && \ 25 curl -f -o /tmp/get-pip.py https://bootstrap.pypa.io/3.2/get-pip.py && \
25 python /tmp/get-pip.py && rm /tmp/get-pip.py 26 python /tmp/get-pip.py && rm /tmp/get-pip.py && \
27 pip install --upgrade pip
26 28
27RUN pip install pymysql psycopg2 py_mini_racer 29RUN pip install pymysql psycopg2 py_mini_racer
28 30