Switch magnum image builds

Change-Id: I5fcdc9fba4d2d6afe9960dc925eed7dcb9b5691c
This commit is contained in:
okozachenko 2020-07-21 23:36:39 +03:00
parent bb67cfc27d
commit 9082ca9172
4 changed files with 8 additions and 17 deletions

View File

@ -13,23 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.io/opendevorg/python-builder as builder FROM vexxhost/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 docker.io/opendevorg/uwsgi-base AS magnum-api-base FROM vexxhost/python-base AS magnum-api
COPY --from=builder /output/ /output
RUN /output/install-from-bindep
FROM magnum-api-base AS magnum-api
EXPOSE 9511 EXPOSE 9511
ENV UWSGI_HTTP_SOCKET=:9511 UWSGI_WSGI_FILE=/usr/local/bin/magnum-api-wsgi ENV UWSGI_HTTP_SOCKET=:9511 UWSGI_WSGI_FILE=/usr/local/bin/magnum-api-wsgi
CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"] CMD ["/usr/local/bin/uwsgi","--ini","/etc/uwsgi/uwsgi.ini"]
FROM docker.io/opendevorg/python-base AS magnum-conductor FROM vexxhost/python-base AS magnum-conductor
COPY --from=builder /output/ /output
RUN /output/install-from-bindep
CMD ["/usr/local/bin/magnum-conductor"] CMD ["/usr/local/bin/magnum-conductor"]

View File

@ -0,0 +1 @@
--constraint https://releases.openstack.org/constraints/upper/ussuri

View File

@ -0,0 +1,4 @@
uWSGI
python-memcached
PyMySQL
git+https://opendev.org/openstack/magnum@stable/ussuri

View File

@ -4,9 +4,6 @@
provides: openstack-operator:image:magnum provides: openstack-operator:image:magnum
vars: &id001 vars: &id001
docker_images: docker_images:
- context: images/magnum
repository: vexxhost/magnum-api-base
target: magnum-api-base
- context: images/magnum - context: images/magnum
repository: vexxhost/magnum-api repository: vexxhost/magnum-api
target: magnum-api target: magnum-api