diff --git a/internal/platform/web/request.go b/internal/platform/web/request.go index 35ce5ad..56ca572 100644 --- a/internal/platform/web/request.go +++ b/internal/platform/web/request.go @@ -3,12 +3,11 @@ package web import ( "context" "encoding/json" - "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/webcontext" - "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror" "net" "net/http" "strings" + "geeks-accelerator/oss/saas-starter-kit/internal/platform/web/weberror" "github.com/gorilla/schema" "github.com/pkg/errors" "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 } diff --git a/tools/devops/scripts/build.sh b/tools/devops/scripts/build.sh index f0d1c90..69a6c76 100755 --- a/tools/devops/scripts/build.sh +++ b/tools/devops/scripts/build.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash doPush=0 -if [[ "${CI_REGISTRY_USER}" != "" ]]; then - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} +if [[ "${CI_REGISTRY_IMAGE}" != "" ]]; then + docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY} releaseImg="${CI_REGISTRY_IMAGE}:devops-${CI_COMMIT_REF_NAME}" doPush=1