mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-06-30 11:10:48 +00:00
Merge branch 'master' of https://github.com/drone/drone
This commit is contained in:
commit
c9f388d608
|
@ -164,7 +164,7 @@ func run(path string) {
|
||||||
if len(*identity) != 0 {
|
if len(*identity) != 0 {
|
||||||
key, err = ioutil.ReadFile(*identity)
|
key, err = ioutil.ReadFile(*identity)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fmt.Printf("[Error] Could not find or read identity file %s\n", identity)
|
fmt.Printf("[Error] Could not find or read identity file %s\n", *identity)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
|
@ -59,7 +59,7 @@ func (c *ImageService) List() ([]*Images, error) {
|
||||||
|
|
||||||
// Create an image, either by pull it from the registry or by importing it.
|
// Create an image, either by pull it from the registry or by importing it.
|
||||||
func (c *ImageService) Create(image string) error {
|
func (c *ImageService) Create(image string) error {
|
||||||
return c.do("POST", fmt.Sprintf("/images/create?fromImage=%s"), nil, nil)
|
return c.do("POST", fmt.Sprintf("/images/create?fromImage=%s", image), nil, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c *ImageService) Pull(image string) error {
|
func (c *ImageService) Pull(image string) error {
|
||||||
|
|
|
@ -65,8 +65,8 @@ func (s *S3) Write(f *buildfile.Buildfile) {
|
||||||
|
|
||||||
// make sure a default access is set
|
// make sure a default access is set
|
||||||
// let's be conservative and assume private
|
// let's be conservative and assume private
|
||||||
if len(s.Region) == 0 {
|
if len(s.Access) == 0 {
|
||||||
s.Region = "private"
|
s.Access = "private"
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the target starts with a "/" we need
|
// if the target starts with a "/" we need
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{{ define "title" }}FAILURE{{end}}
|
{{ define "title" }}SUCCESS{{end}}
|
||||||
|
|
||||||
{{ define "content" }}
|
{{ define "content" }}
|
||||||
<!-- Callout Panel -->
|
<!-- Callout Panel -->
|
||||||
|
|
Loading…
Reference in a new issue