diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aabe23b0094157247dec88aa39c1393168ad7ed7..3d7b7c81ba2c80ab0b5d2842deb67599e984b74b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: alpine variables: - VERSION: v2 + VERSION: v2.1 stages: - build diff --git a/k8s/templates/deployment.yml b/k8s/templates/deployment.yml index 4a82336382e5357d237bf57f1a356896c570c1ba..b78c4c2f579b64ff121a7c10065f30e56e0863a4 100644 --- a/k8s/templates/deployment.yml +++ b/k8s/templates/deployment.yml @@ -19,7 +19,7 @@ spec: name: http env: - name: POSTGRES - value: "postgres://feri:almafa@cockroachdb-public.matrix.svc:26257" + value: "postgres://feri:almafa@cockroachdb-public.matrix.svc:26257/feri" resources: requests: memory: 50Mi @@ -31,6 +31,5 @@ spec: httpGet: path: "/" port: 8080 - initialDelaySeconds: 60 failureThreshold: 3 periodSeconds: 60 diff --git a/k8s/values.yaml b/k8s/values.yaml index 2dee7e551295c46d26bc2c16c1ff38ae428cce5d..3bdd0fc8d8738bb57284589452f8f3d92d072fc4 100644 --- a/k8s/values.yaml +++ b/k8s/values.yaml @@ -2,5 +2,5 @@ replicas: 1 Domain: keresettaferi.kszk.bme.hu Name: keresettaferi -Tag: "v2" +Tag: "v2.1" REGISTRY_CONF: "${REGISTRY_CONF}" diff --git a/model/access.go b/model/access.go index 55b003408eb847ebc6700f3f93f1981a5c630c1a..fd967c71d5891f2283d34e92e1c9b721e1777a79 100644 --- a/model/access.go +++ b/model/access.go @@ -18,6 +18,10 @@ func SaveUser(u *User) error { return db.Omit(clause.Associations).Save(u).Error } +func SaveUserWithGroup(u *User) error { + return db.Save(u).Error +} + func GetGroup(id string) (*Group, error) { var g Group e := db.First(&g, "id = ?", id).Error diff --git a/web/router.go b/web/router.go index ca103d241322dff43d0314f3827a61e0d09b4851..e7c23287e45c0762dcdcf4c8ff229e6250a2bee3 100644 --- a/web/router.go +++ b/web/router.go @@ -88,7 +88,7 @@ func login(c *gin.Context) { Name: c.PostForm("name"), Group: group, } - err = model.SaveUser(user) + err = model.SaveUserWithGroup(user) if err != nil { _ = c.Error(err) return