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

Compare commits

base: Your-System:e0f32d44b112d345aa8d91241befe8a8a33849bb
Branches Tags
Your-System:master
..
compare: Your-System:d8dc527f8894bff93a18fdd480bb1b4a254eddaf
Branches Tags
Your-System:master

No commits in common. "e0f32d44b112d345aa8d91241befe8a8a33849bb" and "d8dc527f8894bff93a18fdd480bb1b4a254eddaf" have entirely different histories.
e0f32d44b1 ... d8dc527f88

8 changed files with 23 additions and 31 deletions
Show Stats Expand all files Collapse all files

10
code-formatter/Dockerfile
View File

@ -7,22 +7,22 @@ RUN apt-get update && \
# add yarn and php
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
curl -sS https://packages.sury.org/php/apt.gpg | apt-key add - && \
echo "deb https://packages.sury.org/php/ stretch main" | tee /etc/apt/sources.list.d/php7.3.list && \
apt-get update && \
apt-get install -y yarn php7.3-cli && \
apt-get install -y yarn php7.0-cli && \
apt-get clean && \
rm -rf /var/lib/apt/lists/* /etc/apt/sources.list.d/* /tmp/* /var/tmp/*
# add php fixer
RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
chmod a+x /usr/local/bin/php-cs-fixer
WORKDIR /app
# add csscomb and prettier
RUN npm install prettier csscomb --global
RUN yarn add prettier csscomb --global && \
ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
COPY ["src/entry.sh", "/app/entry.sh"]

6
code-formatter/Dockerfile.56
View File

@ -14,13 +14,15 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
# add php fixer
RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.14.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
RUN curl -L https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.10.0/php-cs-fixer.phar -o /usr/local/bin/php-cs-fixer && \
chmod a+x /usr/local/bin/php-cs-fixer
WORKDIR /app
# add csscomb and prettier
RUN npm install prettier csscomb --global
RUN yarn add prettier csscomb --global && \
ln -s /app/node_modules/.bin/prettier /usr/local/bin/prettier && \
ln -s /app/node_modules/.bin/csscomb /usr/local/bin/csscomb
COPY ["src/entry.sh", "/app/entry.sh"]

11
code-formatter/Makefile
View File

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

9
code-formatter/src/entry.sh
View File

@ -49,18 +49,13 @@ main() {
prettier)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/prettier.shinc
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
__prettier ${CSS_FILES[@]}
fi
if [[ ${#JS_FILES[@]} -ne 0 ]]; then
__prettier ${JS_FILES[@]}
fi
__prettier
return $?
;;
csscomb)
__initVariables "$@"
source ${INCLUDES_PATH}/formatters/csscomb.shinc
__csscomb ${CSS_FILES[@]}
__csscomb
return $?
;;
php-cs-fixer)

5
code-formatter/src/inc/formatters/csscomb.shinc
View File

@ -3,12 +3,11 @@
__csscomb() {
__msg "Csscomb:"
local files="${1}"
if [[ ${DRY_RUN} -eq 0 ]]; then
csscomb -v "${files[@]}"
csscomb -v "${CSS_FILES[@]}"
else
csscomb --lint -v "${files[@]}"
csscomb --lint -v "${CSS_FILES[@]}"
fi
return $?

5
code-formatter/src/inc/formatters/prettier.shinc
View File

@ -3,13 +3,12 @@
__prettier() {
__msg "Prettier:"
local files="${1}"
if [[ ${DRY_RUN} -eq 0 ]]; then
prettier --write "${files[@]}"
prettier --write "${JS_FILES[@]}"
else
__msg "Listing (: unprettiered :) files:" 1
prettier --list-different "${files[@]}"
prettier --list-different "${JS_FILES[@]}"
fi
return $?

6
code-formatter/src/inc/process.shinc
View File

@ -11,15 +11,13 @@ process() {
# Run css comb
if [[ ${#CSS_FILES[@]} -ne 0 ]]; then
__csscomb "${CSS_FILES[@]}"
[[ $? -ne 0 ]] && failed=1
__prettier "${CSS_FILES[@]}"
__csscomb
[[ $? -ne 0 ]] && failed=1
fi
# Run JS prettier
if [[ ${#JS_FILES[@]} -ne 0 ]]; then
__prettier "${JS_FILES[@]}"
__prettier
[[ $? -ne 0 ]] && failed=1
fi

2
dev-proxy/src/docker-gen/templates/Caddyfile.tmpl
View File

@ -40,7 +40,7 @@ http://{{ $host }}, https://{{ $host }} {
}
gzip {
not /__webpack_hmr
not /__webpack_hmr/
}
log stdout
errors stderr