summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2022-04-19 18:51:57 +0000
committerGerrit Code Review <review@openstack.org>2022-04-19 18:51:57 +0000
commit76324ab5fa6231105a70abc02ecfc0971e2e19bc (patch)
tree541399497a5dcec24e5a78c7fc41b2a1157bddb8
parent9f2d08328ecc8cea1e8b9b10b5aa1d79dff5045c (diff)
parent2c8e6764cc40ff95ace8f9903c444c9c6cc05eb1 (diff)
downloadgear-master.tar.gz
Merge "Update the docker image to python3.9 and buster"HEADmaster
-rw-r--r--.zuul.yaml8
-rw-r--r--Dockerfile4
2 files changed, 6 insertions, 6 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 57e537c..84fb6da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -19,8 +19,8 @@
parent: opendev-build-docker-image
description: Build OpenDev Docker images for gear
requires:
- - python-base-container-image
- - python-builder-container-image
+ - python-base-3.9-bullseye-container-image
+ - python-builder-3.9-bullseye-container-image
provides: gear-container-image
vars: &gear_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/gear
@@ -34,8 +34,8 @@
parent: opendev-upload-docker-image
description: Build OpenDev gear 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: gear-container-image
vars: *gear_opendev_image_vars
secrets:
diff --git a/Dockerfile b/Dockerfile
index 13a86af..3c75b9f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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 geard
+FROM opendevorg/python-base:3.9-bullseye as geard
COPY --from=builder /output/ /output
RUN /output/install-from-bindep