Compare commits

...

2 Commits

Author SHA1 Message Date
84a14307cb Update adminer 2019-11-20 13:50:33 +01:00
98221c2f7a Allow omiting colors 2019-09-17 09:48:37 +02:00
7 changed files with 20 additions and 7 deletions

View File

@ -6,6 +6,12 @@ USER root
RUN rm /usr/local/etc/php/conf.d/0-upload_large_dumps.ini 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"] COPY ["conf.d/", "/usr/local/etc/php/conf.d"]
USER adminer USER adminer

View File

@ -5,7 +5,7 @@ APP_NAME := adminer
IMAGE_NAME := adminer IMAGE_NAME := adminer
VERSION := 4.7.1 VERSION := 4.7.5
all: build release all: build release
.PHONY: all .PHONY: all

View File

@ -3,7 +3,7 @@
SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P ) SCRIPT_PATH=$( cd "$(dirname "$0")" ; pwd -P )
IMAGE_NAME="yoursystemcz/adminer" IMAGE_NAME="yoursystemcz/adminer"
IMAGE_VERSION="4.7.1" IMAGE_VERSION="4.7.3"
SERVICE_NAME=adminer SERVICE_NAME=adminer

View File

@ -17,7 +17,7 @@ GIT_TAG = $(shell git describe --tags --exact-match 2>/dev/null)
VERSION := $(or $(GIT_TAG),latest) VERSION := $(or $(GIT_TAG),latest)
all : VERSION := 1.1.1 all : VERSION := 1.1.2
all : build release all : build release
.PHONY : all .PHONY : all

View File

@ -32,6 +32,8 @@ main() {
_version="${VERSION}" _version="${VERSION}"
fi fi
__initVariables "$@"
__header "Code-Formatter [${_version}]" __header "Code-Formatter [${_version}]"
@ -41,13 +43,11 @@ main() {
case "${_cmd}" in case "${_cmd}" in
process) process)
__initVariables "$@"
source ${INCLUDES_PATH}/process.shinc source ${INCLUDES_PATH}/process.shinc
process process
return $? return $?
;; ;;
prettier) prettier)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/prettier.shinc source ${INCLUDES_PATH}/formatters/prettier.shinc
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
__prettier ${CSS_FILES[@]} __prettier ${CSS_FILES[@]}
@ -58,13 +58,11 @@ main() {
return $? return $?
;; ;;
csscomb) csscomb)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/csscomb.shinc source ${INCLUDES_PATH}/formatters/csscomb.shinc
__csscomb ${CSS_FILES[@]} __csscomb ${CSS_FILES[@]}
return $? return $?
;; ;;
php-cs-fixer) php-cs-fixer)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/php-cs-fixer.shinc source ${INCLUDES_PATH}/formatters/php-cs-fixer.shinc
__phpFixer __phpFixer
return $? return $?

View File

@ -6,30 +6,35 @@
# Colors # Colors
__color_green() { __color_green() {
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
printf '\033[1;31;32m' printf '\033[1;31;32m'
printf -- "%b" "$*" printf -- "%b" "$*"
printf '\033[0m' printf '\033[0m'
} }
__color_red() { __color_red() {
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
printf '\033[1;31m' printf '\033[1;31m'
printf -- "%b" "$*" printf -- "%b" "$*"
printf '\033[0m' printf '\033[0m'
} }
__color_red_bg() { __color_red_bg() {
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
printf '\033[1;41m' printf '\033[1;41m'
printf -- "%b" "$*" printf -- "%b" "$*"
printf '\033[0m' printf '\033[0m'
} }
__color_white() { __color_white() {
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
printf '\033[1;37;40m' printf '\033[1;37;40m'
printf -- "%b" "$*" printf -- "%b" "$*"
printf '\033[0m' printf '\033[0m'
} }
__color_yellow() { __color_yellow() {
[[ ${OMIT_COLORS} -eq 1 ]] && printf -- "%b" "$*" && return
printf '\033[1;31;33m' printf '\033[1;31;33m'
printf -- "%b" "$*" printf -- "%b" "$*"
printf '\033[0m' printf '\033[0m'

View File

@ -11,6 +11,7 @@ PHP_FILES=()
DRY_RUN=0 DRY_RUN=0
OMIT_COLORS=0
VERBOSE=0 VERBOSE=0
@ -21,6 +22,9 @@ __initVariables() {
--dry-run) --dry-run)
DRY_RUN=1 DRY_RUN=1
;; ;;
--no-color)
OMIT_COLORS=1
;;
--verbose) --verbose)
VERBOSE=1 VERBOSE=1
;; ;;