Просмотр исходного кода

Merge branch 'beta.3.buildpack-ci' of https://github.com/porter-dev/porter into beta.3.buildpack-ci

jusrhee 5 лет назад
Родитель
Сommit
612db7ba8c

+ 1 - 1
dashboard/src/components/repo-selector/ContentsList.tsx

@@ -204,7 +204,7 @@ export default class ContentsList extends Component<PropsType, StateType> {
                   key={i}
                   onClick={() =>
                     this.props.setDockerfilePath(
-                      `${this.state.currentDir}/${dockerfile}`
+                      `${this.state.currentDir || "."}/${dockerfile}`
                     )
                   }
                   isLast={this.state.dockerfiles.length - 1 === i}

+ 1 - 1
internal/integrations/ci/actions/actions.go

@@ -123,7 +123,7 @@ func (g *GithubActions) GetGithubActionYAML() ([]byte, error) {
 	}
 
 	if g.DockerFilePath == "" {
-		gaSteps = append(gaSteps, getBuildPackPushStep(g.getBuildEnvSecretName(), g.DockerFilePath, g.ImageRepoURL))
+		gaSteps = append(gaSteps, getBuildPackPushStep(g.getBuildEnvSecretName(), g.FolderPath, g.ImageRepoURL))
 	} else {
 		gaSteps = append(gaSteps, getDockerBuildPushStep(g.getBuildEnvSecretName(), g.DockerFilePath, g.ImageRepoURL))
 	}

+ 3 - 2
server/router/middleware/auth.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -702,7 +701,9 @@ func (auth *Auth) getTokenFromRequest(r *http.Request) *token.Token {
 
 	tok, err := token.GetTokenFromEncoded(reqToken, auth.tokenConf)
 
-	fmt.Printf("ERROR WAS %v\n", err)
+	if err != nil {
+		return nil
+	}
 
 	return tok
 }