mirror of
https://github.com/overleaf/overleaf.git
synced 2025-04-20 04:43:42 +00:00
* Update shellcheck files to include non ".sh" files having the sh shebang * Add shellcheck to root Makefile * `make shellcheck_fix` * Add shellcheck to server-ce and server-pro * Exclude SC1091 (Not following) in SP/CE * Fix errors in SP * Fix errors in CE * Update root shellcheck to ignore all failing rules. We can later remove rules one by one. * Add shellcheck to web * Add shellcheck step for server-ce and server-pro in cloudbuild.yaml * Revert "Add shellcheck to root Makefile" This reverts commit e0fa56f2 * Revert "`make shellcheck_fix`" This reverts commit eb179245c109a9e742a7fdeeb75a4bdd03963587. * `make shellcheck_fix` in server-ce * Fix: Use $(...) notation instead of legacy backticked ``` In init_scripts/100_set_docker_host_ipaddress.sh line 5: echo "`route -n | awk '/UG[ \t]/{print $2}'` dockerhost" >> /etc/hosts ^-- SC2006 (style): Use $(...) notation instead of legacy backticks `...`. Did you mean: echo "$(route -n | awk '/UG[ \t]/{print $2}') dockerhost" >> /etc/hosts For more information: https://www.shellcheck.net/wiki/SC2006 -- Use $(...) notation instead of le... ``` * `make shellcheck_fix` in web * Manual corrections on autofix * Update SHELLCHECK_FILES to Perl regex so it matches at start of file GitOrigin-RevId: 815d53f319a3792efa22703beb75570de5977450
65 lines
2.1 KiB
Makefile
65 lines
2.1 KiB
Makefile
# Makefile
|
|
|
|
MONOREPO_ROOT := ../
|
|
HERE=$(shell pwd)
|
|
export MONOREPO_REVISION := $(shell git rev-parse HEAD)
|
|
export BRANCH_NAME ?= $(shell git rev-parse --abbrev-ref HEAD)
|
|
export OVERLEAF_BASE_BRANCH ?= sharelatex/sharelatex-base:$(BRANCH_NAME)
|
|
export OVERLEAF_BASE_LATEST ?= sharelatex/sharelatex-base
|
|
export OVERLEAF_BASE_TAG ?= sharelatex/sharelatex-base:$(BRANCH_NAME)-$(MONOREPO_REVISION)
|
|
export OVERLEAF_BRANCH ?= sharelatex/sharelatex:$(BRANCH_NAME)
|
|
export OVERLEAF_LATEST ?= sharelatex/sharelatex
|
|
export OVERLEAF_TAG ?= sharelatex/sharelatex:$(BRANCH_NAME)-$(MONOREPO_REVISION)
|
|
|
|
all: build-base build-community
|
|
|
|
build-base:
|
|
cp .dockerignore $(MONOREPO_ROOT)
|
|
docker build \
|
|
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
|
--progress=plain \
|
|
--file Dockerfile-base \
|
|
--pull \
|
|
--cache-from $(OVERLEAF_BASE_LATEST) \
|
|
--cache-from $(OVERLEAF_BASE_BRANCH) \
|
|
--tag $(OVERLEAF_BASE_TAG) \
|
|
--tag $(OVERLEAF_BASE_BRANCH) \
|
|
$(MONOREPO_ROOT)
|
|
|
|
|
|
build-community:
|
|
cp .dockerignore $(MONOREPO_ROOT)
|
|
docker build \
|
|
--build-arg BUILDKIT_INLINE_CACHE=1 \
|
|
--progress=plain \
|
|
--build-arg OVERLEAF_BASE_TAG \
|
|
--build-arg MONOREPO_REVISION \
|
|
--cache-from $(OVERLEAF_LATEST) \
|
|
--cache-from $(OVERLEAF_BRANCH) \
|
|
--file Dockerfile \
|
|
--tag $(OVERLEAF_TAG) \
|
|
--tag $(OVERLEAF_BRANCH) \
|
|
$(MONOREPO_ROOT)
|
|
|
|
SHELLCHECK_OPTS = \
|
|
--shell=bash \
|
|
--external-sources \
|
|
--exclude=SC1091
|
|
SHELLCHECK_COLOR := $(if $(CI),--color=never,--color)
|
|
SHELLCHECK_FILES := { git ls-files "*.sh" -z; git grep -Plz "\A\#\!.*bash"; } | sort -zu
|
|
|
|
shellcheck:
|
|
@$(SHELLCHECK_FILES) | xargs -0 -r docker run --rm -v $(HERE):/mnt -w /mnt \
|
|
koalaman/shellcheck:stable $(SHELLCHECK_OPTS) $(SHELLCHECK_COLOR)
|
|
|
|
shellcheck_fix:
|
|
@$(SHELLCHECK_FILES) | while IFS= read -r -d '' file; do \
|
|
diff=$$(docker run --rm -v $(HERE):/mnt -w /mnt koalaman/shellcheck:stable $(SHELLCHECK_OPTS) --format=diff "$$file" 2>/dev/null); \
|
|
if [ -n "$$diff" ] && ! echo "$$diff" | patch -p1 >/dev/null 2>&1; then echo "\033[31m$$file\033[0m"; \
|
|
elif [ -n "$$diff" ]; then echo "$$file"; \
|
|
else echo "\033[2m$$file\033[0m"; fi \
|
|
done
|
|
|
|
.PHONY: all \
|
|
build-base build-community \
|
|
shellcheck shellcheck_fix
|