Merge "Update container image to bullseye and python3.9"

This commit is contained in:
Zuul 2022-04-19 21:34:03 +00:00 committed by Gerrit Code Review
commit c5ccf46448
2 changed files with 6 additions and 6 deletions

View File

@ -28,8 +28,8 @@
dependencies: opendev-buildset-registry
description: Build OpenDev Docker images for storyboard
requires:
- python-base-container-image
- python-builder-container-image
- python-base-3.9-bullseye-container-image
- python-builder-3.9-bullseye-container-image
provides: storyboard-container-image
vars: &storyboard_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/storyboard
@ -61,8 +61,8 @@
parent: opendev-upload-docker-image
description: Build OpenDev storyboard Docker images and upload to Docker Hub.
requires:
- python-base-container-image
- python-builder-container-image
- python-base-3.9-bullseye-container-image
- python-builder-3.9-bullseye-container-image
provides: storyboard-container-image
vars: *storyboard_opendev_image_vars
secrets:

View File

@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
FROM opendevorg/python-builder as builder
FROM opendevorg/python-builder:3.9-bullseye as builder
COPY . /tmp/src
RUN assemble
FROM opendevorg/python-base as storyboard
FROM opendevorg/python-base:3.9-bullseye as storyboard
COPY --from=builder /output/ /output
RUN /output/install-from-bindep