From 6b98897c0fd35bb01b228409c46131a762b39534 Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Sat, 14 Oct 2023 20:23:08 +0200
Subject: [PATCH] chore(make): use podman by default
---
.gitlab-ci.yml | 4 ++--
Makefile | 2 +-
README.md | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b16ba54..2189d93 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,14 +8,14 @@ lint:
test:
script:
- pacman -Syu --needed --noconfirm podman make
- - make test DOCKER=podman
+ - make test
tags:
- vm
code-coverage:
script:
- pacman -Syu --needed --noconfirm podman make jq
- - make test-coverage DOCKER=podman 2>/dev/null
+ - make test-coverage 2>/dev/null
- "echo \"Percent coverage: $(jq -r .percent_covered coverage/bats.*/coverage.json)%\""
tags:
- vm
diff --git a/Makefile b/Makefile
index b8db799..a1d49d3 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ RUN_OPTIONS:=--rm --network=$(NETWORK) -v $(PWD):/dbscripts:ro --tmpfs=/tmp:exec
CASES ?= cases
JOBS ?= $(shell nproc)
BATS_ARGS ?= --jobs $(JOBS) --verbose-run
-DOCKER ?= docker
+DOCKER ?= podman
test-image:
$(DOCKER) build --pull -t $(IMAGE) test
diff --git a/README.md b/README.md
index c6a19f3..928c0ae 100644
--- a/README.md
+++ b/README.md
@@ -56,8 +56,8 @@ Things that haven't been mentioned yet:
- `cron-jobs/sourceballs`
## Testing
* Install the `make` and `podman` or `docker` packages depending on your
-preferrence. The default expects docker but pomdan can be used if
-`DOCKER=podman` is specified. When using docker, start the docker daemon by
+preferrence. The default expects podman but docker can be used if
+`DOCKER=docker` is specified. When using docker, start the docker daemon by
issuing `systemctl start docker`.
* The test suite can now be run with `make test`.
* A coverage report can be generated with `make test-coverage`. Open `coverage/index.html` in your web browser to inspect the results.
@@ -65,7 +65,7 @@ issuing `systemctl start docker`.
Bats arguments or specific test can be run by providing `CASES` and `BATS_ARGS`:
```
-make test DOCKER=podman CASES=cases/db-update.bats BATS_ARGS='-f Wrong'
+make test CASES=cases/db-update.bats BATS_ARGS='-f Wrong'
```
## License
--
GitLab