Merge branch 'master' of https://github.com/drone/drone

cmd/drone/drone.go

@@ -164,7 +164,7 @@ func run(path string) {
 	if len(*identity) != 0 {
 		key, err = ioutil.ReadFile(*identity)
 		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)
 			return
 		}

pkg/build/docker/image.go

@@ -59,7 +59,7 @@ func (c *ImageService) List() ([]*Images, error) {
 
 // Create an image, either by pull it from the registry or by importing it.
 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 {

pkg/plugin/publish/s3.go

@@ -65,8 +65,8 @@ func (s *S3) Write(f *buildfile.Buildfile) {
 
 	// make sure a default access is set
 	// let's be conservative and assume private
-	if len(s.Region) == 0 {
-		s.Region = "private"
+	if len(s.Access) == 0 {
+		s.Access = "private"
 	}
 
 	// if the target starts with a "/" we need

pkg/template/emails/success.html

@@ -1,4 +1,4 @@
-{{ define "title" }}FAILURE{{end}}
+{{ define "title" }}SUCCESS{{end}}
 
 {{ define "content" }}
 	<!-- Callout Panel -->
@@ -25,4 +25,4 @@
 			<td style="font-family: 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; width: 99%; color: #333; margin: 0; padding: 0;">{{ .Commit.Message }}</td>
 		</tr>
 	</table>
-{{ end }}
+{{ end }}