test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 19:28:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1889 from goodrain/v5.17.1

Browse Source 
feat: merge v5.17.1
This commit is contained in:
Qi Zhang 2024-03-12 15:54:26 +08:00 committed by GitHub
commit bd618e95dd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builder/build/code_build.go
View File

@ -242,6 +242,10 @@ func (s *slugBuild) createVolumeAndMount(re *Request, sourceTarFileName string,
Name: "cache",
MountPath: "/tmp/cache",
})
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: "cache",
MountPath: "/tmp/build/node_modules",
})
}
} else {
volumes = []corev1.Volume{
@ -377,6 +381,9 @@ func (s *slugBuild) runBuildJob(re *Request) error {
if k == "NO_CACHE" && v == "True" {
buildNoCache = true
}
if k == "NODE_MODULES_CACHE" && v == "True" {
buildNoCache = true
}
}
podSpec := corev1.PodSpec{
RestartPolicy: corev1.RestartPolicyOnFailure,

2
builder/repostory.go
View File

@ -118,4 +118,4 @@ func GetRunnerImage(brVersion string) string {
}
// CIVERSION -
var CIVERSION = "v5.16.0-release"
var CIVERSION = "v5.17.1-release"

2
cmd/builder/option/option.go
View File

@ -110,7 +110,7 @@ func (a *Builder) AddFlags(fs *pflag.FlagSet) {
fs.BoolVar(&a.BuildKitCache, "buildkit-cache", false, "whether to enable the buildkit image cache")
fs.IntVar(&a.KeepCount, "keep-count", 5, "default number of reserved copies for images")
fs.IntVar(&a.CleanInterval, "clean-interval", 60, "clean image interval,default 60 minute")
fs.StringVar(&a.BRVersion, "br-version", "v5.16.0-release", "builder and runner version")
fs.StringVar(&a.BRVersion, "br-version", "v5.17.1-release", "builder and runner version")
fs.StringSliceVar(&a.EventLogServers, "event-servers", []string{"rbd-eventlog:6366"}, "event log server address. simple lb")
fs.StringVar(&a.MQAPI, "mq-api", "rbd-mq:6300", "acp_mq api")