Skip to content

The Unified and Autonomous Development Platform

feat: Extend version scheme to support MAJOR (1dev/server:11) and MINOR version tags on container images (1dev/server:11.8) deployed on Docker Hub (OD-2361)

Robin Shenf7d767707dd8
diff --git a/.onedev-buildspec.yml b/.onedev-buildspec.yml
index 3bc747d2a4..01adb534b7 100644
--- a/.onedev-buildspec.yml
+++ b/.onedev-buildspec.yml
@@ -1,4 +1,8 @@
version: 39
+imports:
+- projectPath: onedev
+ revision: main
+ accessTokenSecret: onedev-token
jobs:
- name: Release
steps:
@@ -50,6 +54,9 @@ jobs:
unzip onedev-$buildVersion.zip -d docker
mv docker/onedev-$buildVersion docker/app
cp -r agent docker/
+
+ echo "$buildVersion" | cut -d. -f1 > buildVersion.major
+ echo "$buildVersion" | cut -d. -f1,2 > buildVersion.major.minor
useTTY: true
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
- !UseTemplateStep
@@ -57,10 +64,10 @@ jobs:
templateName: scan vulnerabilities
paramMatrix:
- name: Scan Path
+ secret: false
valuesProvider: !SpecifiedValues
values:
- - server-product/target/docker/app
- secret: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
- !PublishArtifactStep
name: publish artifacts
@@ -77,7 +84,7 @@ jobs:
buildPath: server-product/target/docker
dockerfile: server-product/target/docker/Dockerfile.server
output: !RegistryOutput
- tags: 1dev/server 1dev/server:@build_version@
+ tags: 1dev/server 1dev/server:@build_version@ 1dev/server:@file:buildVersion.major@ 1dev/server:@file:buildVersion.major.minor@
platforms: linux/amd64,linux/arm64
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
- !BuildImageStep
@@ -274,10 +281,10 @@ jobs:
templateName: scan vulnerabilities
paramMatrix:
- name: Scan Path
+ secret: false
valuesProvider: !SpecifiedValues
values:
- - server-product/target/sandbox
- secret: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !ScheduleTrigger
@@ -322,10 +329,10 @@ jobs:
templateName: scan vulnerabilities
paramMatrix:
- name: Scan Path
+ secret: false
valuesProvider: !SpecifiedValues
values:
- - server-product/target/sandbox
- secret: false
condition: ALL_PREVIOUS_STEPS_WERE_SUCCESSFUL
triggers:
- !BranchUpdateTrigger
@@ -361,10 +368,6 @@ jobs:
maxRetries: 3
retryDelay: 30
timeout: 3600
-imports:
-- projectPath: onedev
- revision: main
- accessTokenSecret: onedev-token
stepTemplates:
- name: scan vulnerabilities
steps: