Compare commits
No commits in common. "84a14307cb51c6f037c37ac6e228e5b04e25057e" and "9a75a91df25ff56b293bf8bd7ded90c382c03d62" have entirely different histories.
84a14307cb
...
9a75a91df2
@ -6,12 +6,6 @@ USER root
|
||||
|
||||
RUN rm /usr/local/etc/php/conf.d/0-upload_large_dumps.ini
|
||||
|
||||
RUN apk add --no-cache \
|
||||
$PHPIZE_DEPS \
|
||||
&& pecl install mongodb \
|
||||
&& pecl clear-cache \
|
||||
&& docker-php-ext-enable mongodb
|
||||
|
||||
COPY ["conf.d/", "/usr/local/etc/php/conf.d"]
|
||||
|
||||
USER adminer
|
||||
|
||||
@ -5,7 +5,7 @@ APP_NAME := adminer
|
||||
|
||||
IMAGE_NAME := adminer
|
||||
|
||||
VERSION := 4.7.5
|
||||
VERSION := 4.7.1
|
||||
|
||||
all: build release
|
||||
.PHONY: all
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
|
||||
|
||||
IMAGE_NAME="yoursystemcz/adminer"
|
||||
IMAGE_VERSION="4.7.3"
|
||||
IMAGE_VERSION="4.7.1"
|
||||
|
||||
SERVICE_NAME=adminer
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
|
||||
|
||||
VERSION := $(or $(GIT_TAG),latest)
|
||||
|
||||
all : VERSION := 1.1.2
|
||||
all : VERSION := 1.1.1
|
||||
all : build release
|
||||
.PHONY : all
|
||||
|
||||
|
||||
@ -32,8 +32,6 @@ main() {
|
||||
_version="${VERSION}"
|
||||
fi
|
||||
|
||||
__initVariables "$@"
|
||||
|
||||
__header "Code-Formatter [${_version}]"
|
||||
|
||||
|
||||
@ -43,11 +41,13 @@ main() {
|
||||
|
||||
case "${_cmd}" in
|
||||
process)
|
||||
__initVariables "$@"
|
||||
source ${INCLUDES_PATH}/process.shinc
|
||||
process
|
||||
return $?
|
||||
;;
|
||||
prettier)
|
||||
__initVariables "$@"
|
||||
source ${INCLUDES_PATH}/formatters/prettier.shinc
|
||||
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
|
||||
__prettier ${CSS_FILES[@]}
|
||||
@ -58,11 +58,13 @@ main() {
|
||||
return $?
|
||||
;;
|
||||
csscomb)
|
||||
__initVariables "$@"
|
||||
source ${INCLUDES_PATH}/formatters/csscomb.shinc
|
||||
__csscomb ${CSS_FILES[@]}
|
||||
return $?
|
||||
;;
|
||||
php-cs-fixer)
|
||||
__initVariables "$@"
|
||||
source ${INCLUDES_PATH}/formatters/php-cs-fixer.shinc
|
||||
__phpFixer
|
||||
return $?
|
||||
|
||||
@ -6,35 +6,30 @@
|
||||
|
||||
# Colors
|
||||
__color_green() {
|
||||
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
|
||||
printf '\033[1;31;32m'
|
||||
printf -- "%b" "$*"
|
||||
printf '\033[0m'
|
||||
}
|
||||
|
||||
__color_red() {
|
||||
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
|
||||
printf '\033[1;31m'
|
||||
printf -- "%b" "$*"
|
||||
printf '\033[0m'
|
||||
}
|
||||
|
||||
__color_red_bg() {
|
||||
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
|
||||
printf '\033[1;41m'
|
||||
printf -- "%b" "$*"
|
||||
printf '\033[0m'
|
||||
}
|
||||
|
||||
__color_white() {
|
||||
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
|
||||
printf '\033[1;37;40m'
|
||||
printf -- "%b" "$*"
|
||||
printf '\033[0m'
|
||||
}
|
||||
|
||||
__color_yellow() {
|
||||
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
|
||||
printf '\033[1;31;33m'
|
||||
printf -- "%b" "$*"
|
||||
printf '\033[0m'
|
||||
|
||||
@ -11,7 +11,6 @@ PHP_FILES=()
|
||||
|
||||
|
||||
DRY_RUN=0
|
||||
OMIT_COLORS=0
|
||||
VERBOSE=0
|
||||
|
||||
|
||||
@ -22,9 +21,6 @@ __initVariables() {
|
||||
--dry-run)
|
||||
DRY_RUN=1
|
||||
;;
|
||||
--no-color)
|
||||
OMIT_COLORS=1
|
||||
;;
|
||||
--verbose)
|
||||
VERBOSE=1
|
||||
;;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user