From af7f0a992456a6e5bb299fbf9410ae4a4086b365 Mon Sep 17 00:00:00 2001 From: Alex Lushpai Date: Wed, 13 Feb 2019 17:48:53 +0300 Subject: [PATCH] update golang image version, add validation for .es domain --- docker-compose-test.yml | 4 ++-- docker-compose.yml | 2 +- go.sum | 2 +- src/validator.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose-test.yml b/docker-compose-test.yml index 5b7b322..9767995 100644 --- a/docker-compose-test.yml +++ b/docker-compose-test.yml @@ -11,13 +11,13 @@ services: - ${POSTGRES_ADDRESS:-127.0.0.1:5434}:${POSTGRES_PORT:-5432} mg_telegram_test: - image: golang:1.11.3-stretch + image: golang:1.11-stretch working_dir: /mgtg user: ${UID:-1000}:${GID:-1000} environment: GOCACHE: /go volumes: - - ./:/mgtg/ + - ./:/mgtg - ./static:/static/ links: - postgres_test diff --git a/docker-compose.yml b/docker-compose.yml index edc9a6c..a31ed0e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,7 +11,7 @@ services: - ${POSTGRES_ADDRESS:-127.0.0.1:5434}:${POSTGRES_PORT:-5432} mg_telegram: - image: golang:1.11.3-stretch + image: golang:1.11-stretch working_dir: /mgtg user: ${UID:-1000}:${GID:-1000} environment: diff --git a/go.sum b/go.sum index 51eaa05..b91d15e 100644 --- a/go.sum +++ b/go.sum @@ -14,7 +14,7 @@ github.com/denisenkom/go-mssqldb v0.0.0-20180901172138-1eb28afdf9b6 h1:BZGp1dbKF github.com/denisenkom/go-mssqldb v0.0.0-20180901172138-1eb28afdf9b6/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc= github.com/docker/distribution v2.6.2+incompatible h1:4FI6af79dfCS/CYb+RRtkSHw3q1L/bnDjG1PcPZtQhM= github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M= +github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo= github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= diff --git a/src/validator.go b/src/validator.go index a615259..d2419ae 100644 --- a/src/validator.go +++ b/src/validator.go @@ -8,7 +8,7 @@ import ( "gopkg.in/go-playground/validator.v8" ) -var regCommandName = regexp.MustCompile(`https://?[\da-z.-]+\.(retailcrm\.(ru|pro)|ecomlogic\.com)`) +var regCommandName = regexp.MustCompile(`https://?[\da-z.-]+\.(retailcrm\.(ru|pro|es)|ecomlogic\.com)`) func setValidation() { if v, ok := binding.Validator.Engine().(*validator.Validate); ok {