Merge ~twom/launchpad:merge-db-stable into launchpad:master

[Tom Wardill]

Merge db-stable to master

[Tom Wardill (twom)]

Self approving merge.

review: Approve

diff --git a/database/schema/patch-2210-24-1.sql b/database/schema/patch-2210-24-1.sql
new file mode 100644
index 0000000..2153066
--- /dev/null
+++ b/database/schema/patch-2210-24-1.sql
@@ -0,0 +1,11 @@
+-- Copyright 2021 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE OCIRecipe
+    ADD COLUMN image_name TEXT DEFAULT NULL;
+
+COMMENT ON COLUMN OCIRecipe.image_name IS 'Image name to use on upload to registry.';
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2210, 24, 1);