From 65ba2f32ca2d2c10fb7bc147003fd5ec85d8ef9e Mon Sep 17 00:00:00 2001
From: delvh <dev.lh@web.de>
Date: Fri, 23 Jun 2023 21:52:24 +0200
Subject: [PATCH] Do not publish docker release images on `-dev` tags (#25471)

Try to prevent what happened with tag `v1.21.0-dev` as outlined in
#25193.
Unfortunately, we cannot really test if it works as intended as we would
need to release a new `dev` tag for that.
Fixes #25193 (or at least attempts to).

---------

Co-authored-by: jolheiser <john.olheiser@gmail.com>
---
 docker/manifest.rootless.tmpl | 2 ++
 docker/manifest.tmpl          | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/docker/manifest.rootless.tmpl b/docker/manifest.rootless.tmpl
index 87e6e9dfc2b..1ebf5b73c84 100644
--- a/docker/manifest.rootless.tmpl
+++ b/docker/manifest.rootless.tmpl
@@ -1,12 +1,14 @@
 image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}-rootless
 {{#if build.tags}}
 {{#unless (contains "-rc" build.tag)}}
+{{#unless (contains "-dev" build.tag)}}
 tags:
 {{#each build.tags}}
   - {{this}}-rootless
 {{/each}}
   - "latest-rootless"
 {{/unless}}
+{{/unless}}
 {{/if}}
 manifests:
   -
diff --git a/docker/manifest.tmpl b/docker/manifest.tmpl
index 18847064f62..08ccf61b578 100644
--- a/docker/manifest.tmpl
+++ b/docker/manifest.tmpl
@@ -1,12 +1,14 @@
 image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#if (hasPrefix "refs/heads/release/v" build.ref)}}{{trimPrefix "refs/heads/release/v" build.ref}}-{{/if}}nightly{{/if}}
 {{#if build.tags}}
 {{#unless (contains "-rc" build.tag)}}
+{{#unless (contains "-dev" build.tag)}}
 tags:
 {{#each build.tags}}
   - {{this}}
 {{/each}}
   - "latest"
 {{/unless}}
+{{/unless}}
 {{/if}}
 manifests:
   -