From 6530a82ca86055e50b259c561a20fd0dc12abb6f Mon Sep 17 00:00:00 2001 From: Felippe Date: Sun, 5 May 2019 00:51:38 -0300 Subject: [PATCH 1/3] fix errors during python packages intallation --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3b56218..c2c13b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,7 +117,12 @@ RUN pip install --upgrade --force-reinstall requests # Install known working Python packages RUN pip install \ - --no-cache-dir \ + --no-cache-dir --ignore-installed \ + --constraint /opt/stack/requirements/upper-constraints.txt \ + --requirement /opt/stack/requirements/global-requirements.txt + +RUN pip install \ + --no-cache-dir --ignore-installed \ --constraint /opt/stack/requirements/upper-constraints.txt \ --requirement /opt/stack/requirements/global-requirements.txt \ --requirement /opt/stack/requirements/test-requirements.txt From 19c58d131770d23065a95012d1c03082051a9c11 Mon Sep 17 00:00:00 2001 From: Felippe Date: Sun, 5 May 2019 00:57:15 -0300 Subject: [PATCH 2/3] removed duplicated requirement line --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c2c13b7..b9c587c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -124,7 +124,6 @@ RUN pip install \ RUN pip install \ --no-cache-dir --ignore-installed \ --constraint /opt/stack/requirements/upper-constraints.txt \ - --requirement /opt/stack/requirements/global-requirements.txt \ --requirement /opt/stack/requirements/test-requirements.txt # Setup non-Root user "stack", as required by stack.sh From 0522da0fe08ccf8c094ded28c714d7c22fd87e25 Mon Sep 17 00:00:00 2001 From: Felippe Date: Sun, 5 May 2019 01:06:06 -0300 Subject: [PATCH 3/3] changed git links to github mirror --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b9c587c..0743fc8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,13 +82,13 @@ ARG PROJECTS=" \ # Clone DevStack, Requirements and OpenStack (Core) Projects # - To properly detect a container environment, # we need at least openstack-dev/devstack/commit/63666a2 -RUN git clone git://git.openstack.org/openstack-dev/devstack --branch $DEVSTACK_BRANCH && \ - git clone git://git.openstack.org/openstack/requirements --branch $DEVSTACK_BRANCH /opt/stack/requirements && \ +RUN git clone http://github.com/openstack/devstack --branch $DEVSTACK_BRANCH && \ + git clone http://github.com/openstack/requirements --branch $DEVSTACK_BRANCH /opt/stack/requirements && \ for \ PROJECT in $PROJECTS; \ do \ git clone \ - git://git.openstack.org/openstack/$PROJECT.git \ + http://github.com/openstack/$PROJECT.git \ /opt/stack/$PROJECT \ --branch $PROJECTS_BRANCH \ --depth 1 \