Wenjin Rao fipped

## Makefile
clean:
  docker rm -f xxxx 2>/dev/null; true

## Dockerfile
FROM node:alpine AS build
WORKDIR /usr/src/app
COPY package*.json ./
RUN npm install
COPY . .
RUN npm run build

FROM nginx:alpine AS runtime
COPY default.conf /etc/nginx/conf.d/default.conf
COPY --from=build /usr/src/app/dist /site

## Dockerfile
FROM python:3.8 AS build
RUN pip install mkdocs mkdocs-material
WORKDIR /root
COPY . .
RUN mkdocs build

FROM nginx:alpine
COPY default.conf /etc/nginx/conf.d/default.conf
COPY --from=build /root/site /site

## 📊 Weekly development breakdown
Other       28 hrs 4 mins  ███████████▊░░░░░░░░░  56.4%
TypeScript  18 hrs 59 mins ████████░░░░░░░░░░░░░  38.2%
JSON        2 hrs 10 mins  ▉░░░░░░░░░░░░░░░░░░░░   4.3%
Python      26 mins        ▏░░░░░░░░░░░░░░░░░░░░   0.9%
JavaScript  3 mins         ░░░░░░░░░░░░░░░░░░░░░   0.1%

## git-rm-branch.sh
git push origin :branch-name

## docker.sh
# 删除所有image
docker rmi $(docker images -a -q) -f

# A dangling image is one that is not tagged and is not referenced by any container
# To remove dangling images:
docker image prune

# To remove all images which are not used by existing containers:
docker image prune -a

## notOutput.shell
./a >/dev/null 2>&1

## git-reset.sh
git add a.txt
git reset HEAD -- a.txt # 取消暂存
git checkout -- a.txt # 取消对 a.txt 的修改
git checkout . && git clean -df # 放弃所有修改、新增、删除文件, -d表示同时移除目录,-f表示force。zsh 中 gco . && gclean -df

git rm file_path # 工作区取消变更，本地文件取消变更
git rm --cached file_path # 工作区取消变更
#                         head    index   work dir  wd safe
# Commit Level
# reset --soft [commit]    REF     NO      NO        YES

## dockergrep.sh
docker logs nginx 2>&1 | grep "127."

# ref: http://stackoverflow.com/questions/34724980/finding-a-string-in-docker-logs-of-container

## git.shell
# Now we are in branch master
# Pull PR #50 from remote origin to a new branch dev
git fetch origin pull/50/head:dev
git merge dev

# If PR #50 is merging from branch test, push the change to it to update the pull request
git push origin dev:test
	FROM node:alpine AS build
	WORKDIR /usr/src/app
	COPY package*.json ./
	RUN npm install
	COPY . .
	RUN npm run build

	FROM nginx:alpine AS runtime
	COPY default.conf /etc/nginx/conf.d/default.conf
	COPY --from=build /usr/src/app/dist /site
	FROM python:3.8 AS build
	RUN pip install mkdocs mkdocs-material
	WORKDIR /root
	COPY . .
	RUN mkdocs build

	FROM nginx:alpine
	COPY default.conf /etc/nginx/conf.d/default.conf
	COPY --from=build /root/site /site
	Other 28 hrs 4 mins ███████████▊░░░░░░░░░ 56.4%
	TypeScript 18 hrs 59 mins ████████░░░░░░░░░░░░░ 38.2%
	JSON 2 hrs 10 mins ▉░░░░░░░░░░░░░░░░░░░░ 4.3%
	Python 26 mins ▏░░░░░░░░░░░░░░░░░░░░ 0.9%
	JavaScript 3 mins ░░░░░░░░░░░░░░░░░░░░░ 0.1%
	# 删除所有image
	docker rmi $(docker images -a -q) -f

	# A dangling image is one that is not tagged and is not referenced by any container
	# To remove dangling images:
	docker image prune

	# To remove all images which are not used by existing containers:
	docker image prune -a
	git add a.txt
	git reset HEAD -- a.txt # 取消暂存
	git checkout -- a.txt # 取消对 a.txt 的修改
	git checkout . && git clean -df # 放弃所有修改、新增、删除文件, -d表示同时移除目录,-f表示force。zsh 中 gco . && gclean -df

	git rm file_path # 工作区取消变更，本地文件取消变更
	git rm --cached file_path # 工作区取消变更
	# head index work dir wd safe
	# Commit Level
	# reset --soft [commit] REF NO NO YES
	docker logs nginx 2>&1 \| grep "127."

	# ref: http://stackoverflow.com/questions/34724980/finding-a-string-in-docker-logs-of-container
	# Now we are in branch master
	# Pull PR #50 from remote origin to a new branch dev
	git fetch origin pull/50/head:dev
	git merge dev

	# If PR #50 is merging from branch test, push the change to it to update the pull request
	git push origin dev:test