From 9082ca91720c2f545703cb83a9a3ee05ecc4c474 Mon Sep 17 00:00:00 2001 From: okozachenko Date: Tue, 21 Jul 2020 23:36:39 +0300 Subject: [PATCH] Switch magnum image builds Change-Id: I5fcdc9fba4d2d6afe9960dc925eed7dcb9b5691c --- images/magnum/Dockerfile | 17 +++-------------- images/magnum/constraints.txt | 1 + images/magnum/requirements.txt | 4 ++++ zuul.d/magnum-jobs.yaml | 3 --- 4 files changed, 8 insertions(+), 17 deletions(-) create mode 100644 images/magnum/constraints.txt create mode 100644 images/magnum/requirements.txt diff --git a/images/magnum/Dockerfile b/images/magnum/Dockerfile index 77b8bb81..fa4cdd2b 100644 --- a/images/magnum/Dockerfile +++ b/images/magnum/Dockerfile @@ -13,23 +13,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM docker.io/opendevorg/python-builder as builder -COPY bindep.txt /tmp/src/bindep.txt -ADD https://releases.openstack.org/constraints/upper/ussuri /tmp/src/upper-constraints.txt -RUN assemble magnum==10.0.0 \ - python-memcached \ - PyMySQL +FROM vexxhost/python-builder AS builder -FROM docker.io/opendevorg/uwsgi-base AS magnum-api-base -COPY --from=builder /output/ /output -RUN /output/install-from-bindep - -FROM magnum-api-base AS magnum-api +FROM vexxhost/python-base AS magnum-api EXPOSE 9511 ENV UWSGI_HTTP_SOCKET=:9511 UWSGI_WSGI_FILE=/usr/local/bin/magnum-api-wsgi CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"] -FROM docker.io/opendevorg/python-base AS magnum-conductor -COPY --from=builder /output/ /output -RUN /output/install-from-bindep +FROM vexxhost/python-base AS magnum-conductor CMD ["/usr/local/bin/magnum-conductor"] diff --git a/images/magnum/constraints.txt b/images/magnum/constraints.txt new file mode 100644 index 00000000..3317a098 --- /dev/null +++ b/images/magnum/constraints.txt @@ -0,0 +1 @@ +--constraint https://releases.openstack.org/constraints/upper/ussuri \ No newline at end of file diff --git a/images/magnum/requirements.txt b/images/magnum/requirements.txt new file mode 100644 index 00000000..4579e8d7 --- /dev/null +++ b/images/magnum/requirements.txt @@ -0,0 +1,4 @@ +uWSGI +python-memcached +PyMySQL +git+https://opendev.org/openstack/magnum@stable/ussuri \ No newline at end of file diff --git a/zuul.d/magnum-jobs.yaml b/zuul.d/magnum-jobs.yaml index c916372a..79ef301c 100644 --- a/zuul.d/magnum-jobs.yaml +++ b/zuul.d/magnum-jobs.yaml @@ -4,9 +4,6 @@ provides: openstack-operator:image:magnum vars: &id001 docker_images: - - context: images/magnum - repository: vexxhost/magnum-api-base - target: magnum-api-base - context: images/magnum repository: vexxhost/magnum-api target: magnum-api