Your-System/Docker-development
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: Your-System:cc0b2cd584bcfc3c2c758ae508e7f43b1052d4df
Branches Tags
Your-System:master
..
compare: Your-System:eb03df7e66695419c787218039d029fcc020e0d7
Branches Tags
Your-System:master

No commits in common. "cc0b2cd584bcfc3c2c758ae508e7f43b1052d4df" and "eb03df7e66695419c787218039d029fcc020e0d7" have entirely different histories.
cc0b2cd584 ... eb03df7e66

2 changed files with 4 additions and 4 deletions
Show Stats Expand all files Collapse all files

6
code-formatter/Makefile
View File

@ -17,15 +17,15 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
VERSION := $(or $(GIT_TAG),latest) VERSION := $(or $(GIT_TAG),latest)
all : VERSION := 1.0.3 all : VERSION := 1.0.2
all : build release all : build release
.PHONY : all .PHONY : all
build : build :
docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 . docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.2 .
docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 . docker build --build-arg VERSION=$(VERSION) --build-arg COMMIT_SHA=$(COMMIT) -t $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php5.6 .
docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.0 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) docker tag $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)-php7.2 $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)
release : build release : build
docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION) docker push $(DOCKER_REGISTRY)/$(APP_NAME):$(VERSION)

2
code-formatter/src/inc/variables.shinc
View File

@ -32,7 +32,7 @@ __initVariables() {
CSS_FILES+=("${1}") CSS_FILES+=("${1}")
fi fi
;; ;;
*.js|*.jsx|*.ts) *.js|*.jsx)
__path_exists "${1}" __path_exists "${1}"
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
__err "Specified path does not exist: ${1}" __err "Specified path does not exist: ${1}"