github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

quality-of-life: improve the clean recipe (don't require sudo anymore) (#3020)

Browse source
This commit is contained in:
Georg Lauterbach 2023-01-25 09:16:22 +01:00 committed by GitHub
parent cb8e336d25
commit 2033eeaf54
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -31,8 +31,10 @@ generate-accounts: ALWAYS_RUN
# `docker ps`: Remove any lingering test containers # `docker ps`: Remove any lingering test containers
# `.gitignore`: Remove `test/duplicate_configs` and files copied via `make generate-accounts` # `.gitignore`: Remove `test/duplicate_configs` and files copied via `make generate-accounts`
clean: ALWAYS_RUN clean: ALWAYS_RUN
-@ for CONTAINER in $$(docker ps -a --filter name='^dms-test_.*|^mail_.*|^hadolint$$|^eclint$$|^shellcheck$$' | sed 1d | cut -f 1-1 -d ' '); do docker rm -f $${CONTAINER}; done -@ while read -r LINE; do CONTAINERS+=("$${LINE}"); done < <(docker ps -qaf name='^(dms-test|mail)_.*') ; \
-@ while read -r LINE; do [[ $${LINE} =~ test/.+ ]] && sudo rm -rf $${LINE}; done < .gitignore for CONTAINER in "$${CONTAINERS[@]}"; do docker rm -f "$${CONTAINER}"; done
-@ while read -r LINE; do [[ $${LINE} =~ test/.+ ]] && FILES+=("/mnt$${LINE#test}"); done < .gitignore ; \
docker run --rm -v "$(REPOSITORY_ROOT)/test/:/mnt" alpine ash -c "rm -rf $${FILES[@]}"
# ----------------------------------------------- # -----------------------------------------------
# --- Tests ------------------------------------ # --- Tests ------------------------------------

4
test/linting/lint.sh
View file

@ -21,7 +21,7 @@ function _eclint
if docker run --rm --tty \ if docker run --rm --tty \
--volume "${REPOSITORY_ROOT}:/ci:ro" \ --volume "${REPOSITORY_ROOT}:/ci:ro" \
--workdir "/ci" \ --workdir "/ci" \
--name eclint \ --name dms-test_eclint \
"mstruebing/editorconfig-checker:${ECLINT_VERSION}" ec -config "/ci/test/linting/.ecrc.json" "mstruebing/editorconfig-checker:${ECLINT_VERSION}" ec -config "/ci/test/linting/.ecrc.json"
then then
_log 'info' 'ECLint succeeded' _log 'info' 'ECLint succeeded'
@ -36,6 +36,7 @@ function _hadolint
if docker run --rm --tty \ if docker run --rm --tty \
--volume "${REPOSITORY_ROOT}:/ci:ro" \ --volume "${REPOSITORY_ROOT}:/ci:ro" \
--workdir "/ci" \ --workdir "/ci" \
--name dms-test_hadolint \
"hadolint/hadolint:v${HADOLINT_VERSION}-alpine" hadolint --config "/ci/test/linting/.hadolint.yaml" Dockerfile "hadolint/hadolint:v${HADOLINT_VERSION}-alpine" hadolint --config "/ci/test/linting/.hadolint.yaml" Dockerfile
then then
_log 'info' 'Hadolint succeeded' _log 'info' 'Hadolint succeeded'
@ -89,6 +90,7 @@ function _shellcheck
if docker run --rm --tty \ if docker run --rm --tty \
--volume "${REPOSITORY_ROOT}:/ci:ro" \ --volume "${REPOSITORY_ROOT}:/ci:ro" \
--workdir "/ci" \ --workdir "/ci" \
--name dms-test_shellcheck \
"koalaman/shellcheck-alpine:v${SHELLCHECK_VERSION}" ${CMD_SHELLCHECK[@]} "koalaman/shellcheck-alpine:v${SHELLCHECK_VERSION}" ${CMD_SHELLCHECK[@]}
then then
_log 'info' 'ShellCheck succeeded' _log 'info' 'ShellCheck succeeded'