mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-06-02 13:39:55 +00:00
Code Issues Projects Releases Wiki Activity

Bump DefaultCloneImage version to v1.6.0 (#1254)

Browse source 
backport 47e212fd5e
This commit is contained in:
6543 2022-10-13 17:48:51 +02:00 committed by GitHub
parent 4669c1bc2a
commit cc01c5b064
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/server/flags.go
View file

@ -100,7 +100,7 @@ var flags = []cli.Flag{
EnvVars: []string{"WOODPECKER_DEFAULT_CLONE_IMAGE"},
Name: "default-clone-image",
Usage: "The default docker image to be used when cloning the repo",
Value: "woodpeckerci/plugin-git:latest",
Value: constant.DefaultCloneImage,
},
&cli.StringFlag{
EnvVars: []string{"WOODPECKER_DOCS"},

6
pipeline/frontend/yaml/compiler/compiler.go
View file

@ -7,6 +7,7 @@ import (
backend "github.com/woodpecker-ci/woodpecker/pipeline/backend/types"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend"
"github.com/woodpecker-ci/woodpecker/pipeline/frontend/yaml"
"github.com/woodpecker-ci/woodpecker/shared/constant"
)
// TODO(bradrydzewski) compiler should handle user-defined volumes from YAML
@ -15,8 +16,7 @@ import (
const (
windowsPrefix = "windows/"
defaultCloneImage = "woodpeckerci/plugin-git:latest"
defaultCloneName = "clone"
defaultCloneName = "clone"
networkDriverNAT = "nat"
networkDriverBridge = "bridge"
@ -121,7 +121,7 @@ func (c *Compiler) Compile(conf *yaml.Config) *backend.Config {
// add default clone step
if !c.local && len(conf.Clone.Containers) == 0 && !conf.SkipClone {
cloneImage := defaultCloneImage
cloneImage := constant.DefaultCloneImage
if len(c.defaultCloneImage) > 0 {
cloneImage = c.defaultCloneImage
}

19
shared/constant/constant.go Normal file
View file

@ -0,0 +1,19 @@
// Copyright 2022 Woodpecker Authors
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package constant
const (
DefaultCloneImage = "docker.io/woodpeckerci/plugin-git:v1.6.0"
)