Skip to content

Commit f8deb11

Browse files
authored
Make docker gitea/gitea:v1.15-dev etc refer to the latest build on that branch (#18551) (#18569) (#18575)
Backport #18551 One of the problems with our current docker tagging is that although we have strict version tags, latest and dev we do not have a way for docker users to track the current release branch. This PR simply suggests that we use the 1.x-dev tag for these and we build and push these. This will give users who want or need unreleased bug fixes the option of tracking the pre-release version instead of simply jumping to dev. However, there is a problem with #18551/#18569 whereby the manifest is not properly uploading. Therefore this PR adds in some debug logging in order to get this to debug things. Signed-off-by: Andrew Thornton <[email protected]>
1 parent 5a16cbd commit f8deb11

File tree

3 files changed

+19
-6
lines changed

3 files changed

+19
-6
lines changed

.drone.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,6 +1041,7 @@ steps:
10411041
auto_tag: false
10421042
ignore_missing: true
10431043
spec: docker/manifest.rootless.tmpl
1044+
dump: true
10441045
password:
10451046
from_secret: docker_password
10461047
username:
@@ -1052,6 +1053,7 @@ steps:
10521053
auto_tag: false
10531054
ignore_missing: true
10541055
spec: docker/manifest.tmpl
1056+
dump: true
10551057
password:
10561058
from_secret: docker_password
10571059
username:
@@ -1060,6 +1062,7 @@ steps:
10601062
trigger:
10611063
ref:
10621064
- refs/heads/main
1065+
- "refs/heads/release/v*"
10631066
event:
10641067
exclude:
10651068
- cron

docker/manifest.rootless.tmpl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-rootless
1+
# tag: {{build.tag}}
2+
# commit: {{build.commit}}
3+
# ref: {{build.ref}}
4+
# branch: {{build.branch}}
5+
#
6+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-rootless
27
{{#if build.tags}}
38
tags:
49
{{#each build.tags}}
@@ -8,12 +13,12 @@ tags:
813
{{/if}}
914
manifests:
1015
-
11-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-linux-amd64-rootless
16+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-amd64-rootless
1217
platform:
1318
architecture: amd64
1419
os: linux
1520
-
16-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}-linux-arm64-rootless
21+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-arm64-rootless
1722
platform:
1823
architecture: arm64
1924
os: linux

docker/manifest.tmpl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}dev{{/if}}
1+
# tag: {{build.tag}}
2+
# commit: {{build.commit}}
3+
# ref: {{build.ref}}
4+
# branch: {{build.branch}}
5+
#
6+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}
27
{{#if build.tags}}
38
tags:
49
{{#each build.tags}}
@@ -7,12 +12,12 @@ tags:
712
{{/if}}
813
manifests:
914
-
10-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-amd64
15+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-amd64
1116
platform:
1217
architecture: amd64
1318
os: linux
1419
-
15-
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{else}}dev-{{/if}}linux-arm64
20+
image: gitea/gitea:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}{{#equal build.ref "refs/heads/main"}}dev{{else}}{{trimPrefix "refs/heads/release/v" build.ref}}-dev{{/equal}}{{/if}}-linux-arm64
1621
platform:
1722
architecture: arm64
1823
os: linux

0 commit comments

Comments
 (0)