Merge "Fix monasca-common for building Docker image"

2019-03-01 14:34:02 +00:00 · 2019-03-01 14:34:02 +00:00 · 62e9fa5cfe
parent 24aef15057 4f70a6405d
commit 62e9fa5cfe
1 changed files with 3 additions and 0 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -114,6 +114,9 @@ ONBUILD RUN \
            [ ! "$(git -C /monasca-common tag -l ${COMMON_VERSION})" ] && \
                sed -i "s|monasca-common.*||" \
                    /app/upper-constraints.txt || true && \
+            [ $DOCKER_IMAGE = "monasca/client" ] && \
+                sed -i "s|python-monascaclient.*||" \
+                    /app/upper-constraints.txt || true && \
            pip3 install \
                --editable /monasca-common \
                --constraint /app/upper-constraints.txt && \