docker: switch to using uwsgi-base
This changes switches the Docker image to use the uwsgi-base image which have no changes in the consumption of the image. Depends-On: https://review.opendev.org/713953 Change-Id: Ia04425ca7bf22f0e9cc2dbe35daefa466c92dd56
This commit is contained in:
parent
d66b0e82fb
commit
7bca3dd30d
|
@ -19,8 +19,7 @@
|
||||||
parent: opendev-build-docker-image
|
parent: opendev-build-docker-image
|
||||||
description: Build OpenDev Docker images for LodgeIt
|
description: Build OpenDev Docker images for LodgeIt
|
||||||
requires:
|
requires:
|
||||||
- python-base-3.7-container-image
|
- uwsgi-base-3.7-container-image
|
||||||
- python-builder-3.7-container-image
|
|
||||||
provides: lodgeit-container-image
|
provides: lodgeit-container-image
|
||||||
vars: &lodgeit_opendev_image_vars
|
vars: &lodgeit_opendev_image_vars
|
||||||
zuul_work_dir: src/opendev.org/opendev/lodgeit
|
zuul_work_dir: src/opendev.org/opendev/lodgeit
|
||||||
|
@ -34,8 +33,7 @@
|
||||||
parent: opendev-upload-docker-image
|
parent: opendev-upload-docker-image
|
||||||
description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
|
description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
|
||||||
requires:
|
requires:
|
||||||
- python-base-3.7-container-image
|
- uwsgi-base-3.7-container-image
|
||||||
- python-builder-3.7-container-image
|
|
||||||
provides: lodgeit-container-image
|
provides: lodgeit-container-image
|
||||||
vars: *lodgeit_opendev_image_vars
|
vars: *lodgeit_opendev_image_vars
|
||||||
secrets:
|
secrets:
|
||||||
|
|
|
@ -17,15 +17,11 @@ FROM opendevorg/python-builder:3.7 as builder
|
||||||
COPY . /tmp/src
|
COPY . /tmp/src
|
||||||
RUN assemble
|
RUN assemble
|
||||||
|
|
||||||
FROM opendevorg/python-base:3.7 as lodgeit
|
FROM opendevorg/uwsgi-base:3.7 as lodgeit
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
RUN /output/install-from-bindep
|
RUN /output/install-from-bindep
|
||||||
|
|
||||||
USER nobody
|
|
||||||
EXPOSE 9000
|
EXPOSE 9000
|
||||||
ENV LODGEIT_DBURI sqlite:////tmp/lodgeit.db
|
ENV LODGEIT_DBURI sqlite:////tmp/lodgeit.db
|
||||||
ENV LODGEIT_SECRET_KEY changeMe
|
ENV LODGEIT_SECRET_KEY changeMe
|
||||||
CMD ["uwsgi", "--master", \
|
ENV UWSGI_HTTP_SOCKET=:9000 UWSGI_WSGI_FILE=/usr/local/bin/lodgeit-wsgi
|
||||||
"--processes", "4", \
|
|
||||||
"--http-socket", "0.0.0.0:9000", \
|
|
||||||
"--wsgi-file", "/usr/local/bin/lodgeit-wsgi"]
|
|
||||||
|
|
|
@ -10,4 +10,3 @@ Babel
|
||||||
pillow
|
pillow
|
||||||
pytz
|
pytz
|
||||||
MarkupSafe
|
MarkupSafe
|
||||||
uwsgi
|
|
||||||
|
|
Loading…
Reference in New Issue