From 76cd5a7bf941f22da8395b1cbc9e3ac7c0607758 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Sat, 26 Apr 2025 12:10:27 +0200 Subject: [PATCH] Add build of modern Ubuntu distributions With world moving forward, we need to assure that more modern tools and images are going to be built for DB Backups. For that we are starting with allowing to provide a different OS for the Dockerfile as well as add OS version to the promote jobs. This should be the first step before moving forward with adding more jobs/images on modern distributions. Change preserves current behaviour, as new ubuntu images need to be published before proceeding further. Change-Id: I7b4fc6ed8771f119eaac19d8643e78d2a36bb02f --- backup/Dockerfile | 3 ++- playbooks/image-build/docker-registry.yaml | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backup/Dockerfile b/backup/Dockerfile index b1f2442804..1d8b2a884d 100644 --- a/backup/Dockerfile +++ b/backup/Dockerfile @@ -1,4 +1,5 @@ -FROM quay.io/openstack.trove/ubuntu:20.04 +ARG BASE_OS_VERSION=20.04 +FROM quay.io/openstack.trove/ubuntu:$BASE_OS_VERSION LABEL maintainer="Trove Project (https://storyboard.openstack.org/#!/project/openstack/trove)" ARG DATASTORE="mysql" diff --git a/playbooks/image-build/docker-registry.yaml b/playbooks/image-build/docker-registry.yaml index 084a784c43..662c49cbf6 100644 --- a/playbooks/image-build/docker-registry.yaml +++ b/playbooks/image-build/docker-registry.yaml @@ -37,6 +37,7 @@ source: pull loop: - { source: "ubuntu", dest: "ubuntu", tag: "20.04" } + - { source: "ubuntu", dest: "ubuntu", tag: "24.04" } - { source: "registry", dest: "registry", tag: "2" } - { source: "mysql", dest: "mysql", tag: "5.7" } - { source: "mysql", dest: "mysql", tag: "8.0" } @@ -51,12 +52,13 @@ args: DATASTORE: "{{ item.datastore }}" DATASTORE_VERSION: "{{ item.version }}" + BASE_OS_VERSION: "{{ item.os_version }}" name: "quay.io/openstack.trove/{{ item.backup_image }}" tag: "{{ item.version }}" push: true source: build loop: - - { datastore: "mysql", backup_image: "db-backup-mysql", version: "5.7" } - - { datastore: "mysql", backup_image: "db-backup-mysql",version: "8.0" } - - { datastore: "mariadb", backup_image: "db-backup-mariadb", version: "10.4" } - - { datastore: "postgresql", backup_image: "db-backup-postgresql", version: "12" } + - { datastore: "mysql", backup_image: "db-backup-mysql", version: "5.7", os_version: "20.04" } + - { datastore: "mysql", backup_image: "db-backup-mysql", version: "8.0", os_version: "20.04" } + - { datastore: "mariadb", backup_image: "db-backup-mariadb", version: "10.4", os_version: "20.04" } + - { datastore: "postgresql", backup_image: "db-backup-postgresql", version: "12", os_version: "20.04" }