Skip to content

Commit

Permalink
Merge pull request #3 from containerum/dev-v2.1.2
Browse files Browse the repository at this point in the history
Dev v2.1.2
  • Loading branch information
kfeofantov authored Sep 26, 2017
2 parents 0a37757 + 6b9333f commit 125e29e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
11 changes: 9 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COMMIT_HASH = `git rev-parse --short HEAD 2>/dev/null`
BUILD_DATE = `date +%FT%T%Z`
DEFAULT_TCP_SERVER = sdk.containerum.io:3000
DEFAULT_HTTP_SERVER = http://sdk.containerum.io:3333
VERSION = 2.1.1
VERSION = 2.1.2
REQLDFLAGS = -X ${PACKAGE}/chlib.CommitHash=${COMMIT_HASH} \
-X ${PACKAGE}/chlib.BuildDate=${BUILD_DATE} \
-X ${PACKAGE}/chlib/dbconfig.DefaultTCPServer=${DEFAULT_TCP_SERVER} \
Expand All @@ -24,9 +24,16 @@ INSTDIR ?= ${DESTDIR}/${PREFIX}/bin
AUTOCOMPDIR ?= ${DESTDIR}/${PREFIX}/share/bash-completion/completions
AUTOCOMPFILE = ${AUTOCOMPDIR}/chkit.completion

have_docker_perm = $(shell docker images >/dev/null 2>/dev/null && echo 1)

ifneq ($(have_docker_perm),1)
$(info You don`t have permissions to run docker, so run with sudo)
sudo=sudo
endif

define do_build
@echo -e "\x1b[35mRun go build\x1b[0m"
@docker run --rm \
@$(sudo) docker run --rm \
-v $(shell pwd)/${BUILDDIR}:/${BUILDDIR} \
-v $(shell pwd):/go/src/${PACKAGE} \
-e GOOS \
Expand Down
2 changes: 1 addition & 1 deletion chlib/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ var (
PortRegex = regexp.MustCompile(`^(\D+):(\d+)(:(\d+))?(:(TCP|UDP))?$`)
PortNameRegex = LabelRegex
VolumesRegex = regexp.MustCompile(`([^"]\S*|".+?")\s*`)
VolumeRegex = regexp.MustCompile(`^"?(` + nameRegex + `)(\/([^/][^\x00]+))?"?="?(\/[^\x00]+)"?$`) // format: "volumeLabel/subPath"="/mountPath"
VolumeRegex = regexp.MustCompile(`(?U)^"?(` + nameRegex + `)(/([^/][^\x00]+))?"?="?(/[^\x00]+)"?$`) // format: "volumeLabel/subPath"="/mountPath"
)

0 comments on commit 125e29e

Please sign in to comment.