Merge "Update refstack image to bullseye"
This commit is contained in:
commit
d2016bcba0
@ -16,14 +16,14 @@
|
|||||||
# upload trigger - Mon 26 Oct 2021 06:00 PM UTC
|
# upload trigger - Mon 26 Oct 2021 06:00 PM UTC
|
||||||
# refstack commit - bb0e985734690394e227d16af893b8e4ac8d3724
|
# refstack commit - bb0e985734690394e227d16af893b8e4ac8d3724
|
||||||
|
|
||||||
FROM opendevorg/python-builder as builder
|
FROM opendevorg/python-builder:3.8-bullseye as builder
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \
|
&& apt-get -y install git apt-utils python3-dev dh-python libc-dev-bin \
|
||||||
libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \
|
libc6-dev libexpat1-dev libpython3-dev libpython3-dev linux-libc-dev \
|
||||||
apt-transport-https curl gnupg2 \
|
apt-transport-https curl gnupg2 \
|
||||||
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
|
&& curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
|
||||||
&& echo "deb https://deb.nodesource.com/node_15.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list \
|
&& echo "deb https://deb.nodesource.com/node_16.x bullseye main" | tee /etc/apt/sources.list.d/nodesource.list \
|
||||||
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
|
&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
|
||||||
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
|
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
@ -43,7 +43,7 @@ RUN python -m venv /tmp/venv \
|
|||||||
&& /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \
|
&& /tmp/venv/bin/python /tmp/src/tools/convert-docs.py -o /tmp/src/refstack-ui/app/components/about/templates /tmp/src/doc/source/*.rst \
|
||||||
&& rm -rf /tmp/venv
|
&& rm -rf /tmp/venv
|
||||||
|
|
||||||
FROM opendevorg/python-base as refstack
|
FROM opendevorg/python-base:3.8-bullseye as refstack
|
||||||
|
|
||||||
COPY --from=builder /output/ /output
|
COPY --from=builder /output/ /output
|
||||||
COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app
|
COPY --from=builder /tmp/src/refstack-ui/app/ /refstack-ui/app
|
||||||
@ -55,4 +55,4 @@ RUN /output/install-from-bindep \
|
|||||||
&& rm -rf /output
|
&& rm -rf /output
|
||||||
|
|
||||||
ENTRYPOINT ["/usr/bin/entrypoint"]
|
ENTRYPOINT ["/usr/bin/entrypoint"]
|
||||||
CMD ["pecan", "serve", "/usr/local/lib/python3.7/site-packages/refstack/api/config.py"]
|
CMD ["pecan", "serve", "/usr/local/lib/python3.8/site-packages/refstack/api/config.py"]
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
name: system-config-build-image-refstack
|
name: system-config-build-image-refstack
|
||||||
description: Build a refstack image.
|
description: Build a refstack image.
|
||||||
parent: system-config-build-image
|
parent: system-config-build-image
|
||||||
|
requires: &refstack_requires
|
||||||
|
- python-base-3.8-bullseye-container-image
|
||||||
|
- python-builder-3.8-bullseye-container-image
|
||||||
|
provides: refstack-container-image
|
||||||
vars: &refstack_vars
|
vars: &refstack_vars
|
||||||
docker_images:
|
docker_images:
|
||||||
- context: docker/refstack
|
- context: docker/refstack
|
||||||
@ -15,8 +19,11 @@
|
|||||||
name: system-config-upload-image-refstack
|
name: system-config-upload-image-refstack
|
||||||
description: Build and upload a refstack image.
|
description: Build and upload a refstack image.
|
||||||
parent: system-config-upload-image
|
parent: system-config-upload-image
|
||||||
|
requires: *refstack_requires
|
||||||
|
provides: refstack-container-image
|
||||||
vars: *refstack_vars
|
vars: *refstack_vars
|
||||||
files: *refstack_files
|
files: *refstack_files
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: system-config-promote-image-refstack
|
name: system-config-promote-image-refstack
|
||||||
description: Promote a previously published refstack image to latest.
|
description: Promote a previously published refstack image to latest.
|
||||||
|
@ -1021,7 +1021,8 @@
|
|||||||
ansible-version: 2.9
|
ansible-version: 2.9
|
||||||
description: |
|
description: |
|
||||||
Run the playbook for refstack server.
|
Run the playbook for refstack server.
|
||||||
dependencies: opendev-buildset-registry
|
requires:
|
||||||
|
- refstack-container-image
|
||||||
timeout: 3600
|
timeout: 3600
|
||||||
nodeset:
|
nodeset:
|
||||||
nodes:
|
nodes:
|
||||||
|
Loading…
Reference in New Issue
Block a user