go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-08-06 22:32:51 +02:00
Code Issues Releases Activity

Fix docker login for devops build

Browse Source
This commit is contained in:
Lee Brown
2019-08-06 17:28:13 -08:00
parent e54702712d
commit 645fd65cd8
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/platform/web/request.go
View File

@ -3,12 +3,11 @@ package web
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror"
"net" "net"
"net/http" "net/http"
"strings" "strings"
"geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror"
"github.com/gorilla/schema" "github.com/gorilla/schema"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/xwb1989/sqlparser" "github.com/xwb1989/sqlparser"
@ -51,14 +50,6 @@ func Decode(ctx context.Context, r *http.Request, val interface{}) error {
} }
} }
// Hack since we have no DB connection.
ctx = context.WithValue(ctx, webcontext.KeyTagUnique, true)
if err := webcontext.Validator().StructCtx(ctx, val); err != nil {
verr, _ := weberror.NewValidationError(ctx, err)
return verr
}
return nil return nil
} }

4
tools/devops/scripts/build.sh
View File

@ -1,8 +1,8 @@
#!/usr/bin/env bash #!/usr/bin/env bash
doPush=0 doPush=0
if [[ "${CI_REGISTRY_USER}" != "" ]]; then if [[ "${CI_REGISTRY_IMAGE}" != "" ]]; then
docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
releaseImg="${CI_REGISTRY_IMAGE}:devops-${CI_COMMIT_REF_NAME}" releaseImg="${CI_REGISTRY_IMAGE}:devops-${CI_COMMIT_REF_NAME}"
doPush=1 doPush=1