Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev v2.1.2 #3

Merged
merged 3 commits into from
Sep 26, 2017
Merged

Dev v2.1.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445b97d
Fix bug with quotes in volume mount prompt
xakep666 Sep 26, 2017
1d8a757
Autodetect if user has permissions to run docker without sudo
xakep666 Sep 26, 2017
6b9333f
Update version to 2.1.2
xakep666 Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
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
View file
Open in desktop
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"
)