Skip to content

Commit 1741afa

Browse files
authored
Merge pull request #111 from mboersma/update-docker-go-dev
chore(Dockerfile): update go-dev to v0.21.0
2 parents 578082f + 836c2c5 commit 1741afa

5 files changed

Lines changed: 7 additions & 4 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/deis/go-dev:0.20.0
1+
FROM quay.io/deis/go-dev:v0.21.0
22
# This Dockerfile is used to bundle the source and all dependencies into an image for testing.
33

44
ADD https://codecov.io/bash /usr/local/bin/codecov

auth/auth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
// Register a new user with the controller.
12-
// If controller registration is set to administratiors only, a valid administrative
12+
// If controller registration is set to administrators only, a valid administrative
1313
// user token is required in the client.
1414
func Register(c *deis.Client, username, password, email string) error {
1515
user := api.AuthRegisterRequest{Username: username, Password: password, Email: email}

hooks/hooks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func GetAppConfig(c *deis.Client, username, app string) (api.Config, error) {
5151
}
5252

5353
// CreateBuild creates a new release of an application. It returns the version of the new release.
54-
// gitSha should be the first 8 charecters of the git commit sha. Image is either the docker image
54+
// gitSha should be the first 8 characters of the git commit sha. Image is either the docker image
5555
// location for the dockerfile app the absolute url to the tar file for a buldpack app.
5656
func CreateBuild(c *deis.Client, username, app, image, gitSha string, procfile api.ProcessType,
5757
usingDockerifle bool) (int, error) {

http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ func (c *Client) CheckConnection() error {
109109
Make sure that the Controller URI is correct, the server is running and
110110
your deis version is correct.`
111111

112-
// Make a request to /v2/ and expect a 401 respone
112+
// Make a request to /v2/ and expect a 401 response
113113
req, err := http.NewRequest("GET", c.ControllerURL.String()+"/v2/", bytes.NewBuffer(nil))
114114
addUserAgent(&req.Header, c.UserAgent)
115115

keys/keys.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ func List(c *deis.Client, results int) (api.Keys, int, error) {
3131
func New(c *deis.Client, id string, pubKey string) (api.Key, error) {
3232
req := api.KeyCreateRequest{ID: id, Public: pubKey}
3333
body, err := json.Marshal(req)
34+
if err != nil {
35+
return api.Key{}, err
36+
}
3437

3538
res, reqErr := c.Request("POST", "/v2/keys/", body)
3639
if reqErr != nil && !deis.IsErrAPIMismatch(reqErr) {

0 commit comments

Comments
 (0)