Skip to content

Commit 70ffec4

Browse files
zeripathzeripath
authored
Fix pushing to 1-x-dev docker tag (#18578) (#18579)
* Fix pushing to 1-x-dev docker tag It appears that #18551 and #18573 have a mistake in that raymond does not have an {{else}} on {{#equal}}. This PR notes that Sprig has a hasPrefix function and so we use this with another if. Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag (part 2) Although we now have the manifest working, we need to create the images. Here we adjust the .drone.yml to force building of the images Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix pushing to 1-x-dev docker tag OK now we have the images building we should make sure that the main ones stays dev and the release/v* ones become *-dev-* Signed-off-by: Andrew Thornton <art27@cantab.net>
1 parent bc196a3 commit 70ffec4

File tree

3 files changed

+133
-6
lines changed

3 files changed

+133
-6
lines changed

‎.drone.yml

+127
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,67 @@ steps:
850850
exclude:
851851
- pull_request
852852

853+
---
854+
kind: pipeline
855+
name: docker-linux-amd64-release-branch
856+
857+
platform:
858+
os: linux
859+
arch: amd64
860+
861+
depends_on:
862+
- testing-amd64
863+
- testing-arm64
864+
865+
trigger:
866+
ref:
867+
- "refs/heads/release/v*"
868+
event:
869+
exclude:
870+
- cron
871+
872+
steps:
873+
- name: fetch-tags
874+
image: docker:git
875+
commands:
876+
- git fetch --tags --force
877+
878+
- name: publish
879+
pull: always
880+
image: techknowlogick/drone-docker:latest
881+
settings:
882+
auto_tag: false
883+
tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64
884+
repo: gitea/gitea
885+
build_args:
886+
- GOPROXY=https://goproxy.cn
887+
password:
888+
from_secret: docker_password
889+
username:
890+
from_secret: docker_username
891+
when:
892+
event:
893+
exclude:
894+
- pull_request
895+
896+
- name: publish-rootless
897+
image: techknowlogick/drone-docker:latest
898+
settings:
899+
dockerfile: Dockerfile.rootless
900+
auto_tag: false
901+
tags: ${DRONE_BRANCH##release/v}-dev-linux-amd64-rootless
902+
repo: gitea/gitea
903+
build_args:
904+
- GOPROXY=https://goproxy.cn
905+
password:
906+
from_secret: docker_password
907+
username:
908+
from_secret: docker_username
909+
when:
910+
event:
911+
exclude:
912+
- pull_request
913+
853914
---
854915
kind: pipeline
855916
type: docker
@@ -1006,6 +1067,68 @@ steps:
10061067
event:
10071068
exclude:
10081069
- pull_request
1070+
1071+
---
1072+
kind: pipeline
1073+
name: docker-linux-arm64-release-branch
1074+
1075+
platform:
1076+
os: linux
1077+
arch: arm64
1078+
1079+
depends_on:
1080+
- testing-amd64
1081+
- testing-arm64
1082+
1083+
trigger:
1084+
ref:
1085+
- "refs/heads/release/v*"
1086+
event:
1087+
exclude:
1088+
- cron
1089+
1090+
steps:
1091+
- name: fetch-tags
1092+
image: docker:git
1093+
commands:
1094+
- git fetch --tags --force
1095+
1096+
- name: publish
1097+
pull: always
1098+
image: techknowlogick/drone-docker:latest
1099+
settings:
1100+
auto_tag: false
1101+
tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64
1102+
repo: gitea/gitea
1103+
build_args:
1104+
- GOPROXY=https://goproxy.cn
1105+
password:
1106+
from_secret: docker_password
1107+
username:
1108+
from_secret: docker_username
1109+
when:
1110+
event:
1111+
exclude:
1112+
- pull_request
1113+
1114+
- name: publish-rootless
1115+
image: techknowlogick/drone-docker:latest
1116+
settings:
1117+
dockerfile: Dockerfile.rootless
1118+
auto_tag: false
1119+
tags: ${DRONE_BRANCH##release/v}-dev-linux-arm64-rootless
1120+
repo: gitea/gitea
1121+
build_args:
1122+
- GOPROXY=https://goproxy.cn
1123+
password:
1124+
from_secret: docker_password
1125+
username:
1126+
from_secret: docker_username
1127+
when:
1128+
event:
1129+
exclude:
1130+
- pull_request
1131+
10091132
---
10101133
kind: pipeline
10111134
type: docker
@@ -1094,6 +1217,8 @@ trigger:
10941217
depends_on:
10951218
- docker-linux-amd64-release
10961219
- docker-linux-arm64-release
1220+
- docker-linux-amd64-release-branch
1221+
- docker-linux-arm64-release-branch
10971222

10981223
---
10991224
kind: pipeline
@@ -1127,6 +1252,8 @@ depends_on:
11271252
- docker-linux-arm64-release
11281253
- docker-linux-amd64-release-version
11291254
- docker-linux-arm64-release-version
1255+
- docker-linux-amd64-release-branch
1256+
- docker-linux-arm64-release-branch
11301257
- docker-manifest
11311258
- docker-manifest-version
11321259
- docs

‎docker/manifest.rootless.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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
1+
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}}dev{{/if}}-rootless
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
@@ -8,12 +8,12 @@ tags:
88
{{/if}}
99
manifests:
1010
-
11-
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
11+
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}}dev{{/if}}-linux-amd64-rootless
1212
platform:
1313
architecture: amd64
1414
os: linux
1515
-
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-arm64-rootless
16+
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}}dev{{/if}}-linux-arm64-rootless
1717
platform:
1818
architecture: arm64
1919
os: linux

‎docker/manifest.tmpl

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
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}}
1+
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}}dev{{/if}}
22
{{#if build.tags}}
33
tags:
44
{{#each build.tags}}
@@ -8,12 +8,12 @@ tags:
88
{{/if}}
99
manifests:
1010
-
11-
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
11+
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}}dev{{/if}}-linux-amd64
1212
platform:
1313
architecture: amd64
1414
os: linux
1515
-
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-arm64
16+
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}}dev{{/if}}-linux-arm64
1717
platform:
1818
architecture: arm64
1919
os: linux

0 commit comments

Comments
 (0)