ci: Build Docker image during test

.github/workflows/ci.yml

@@ -17,16 +17,27 @@ jobs:
     if: "!startsWith(github.ref, 'refs/tags/') && github.ref != 'refs/heads/main'"
 
   Test:
-    # The custom image here contains pre-built libraries for leveldb and
-    # rocksdb, which are needed to build and test those modules.
-    # To update the container image, see docker.yml.
     runs-on: ubuntu-latest
-    container: cometbft/cometbft-db-testing
     steps:
       - uses: actions/checkout@v3
+
+      - name: Set up Docker Build
+        uses: docker/setup-buildx-action@v2.4.1
+        with:
+          driver: docker
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: ./tools
+          file: ./tools/Dockerfile
+          tags: "cometbft/cometbft-db-testing:latest"
+          load: true
+
       - name: test & coverage report creation
         run: |
-          CGO_ENABLED=1 go test ./... -mod=readonly -timeout 8m -race -coverprofile=coverage.txt -covermode=atomic -tags=memdb,goleveldb,cleveldb,boltdb,rocksdb,badgerdb -v
+          NON_INTERACTIVE=1 make docker-test
+
       - uses: codecov/codecov-action@v3
         with:
           file: ./coverage.txt

.github/workflows/docker.yml

@@ -12,14 +12,9 @@
 name: Docker testing image
 on:
   workflow_dispatch:
-  pull_request:
-    paths:
-      - "tools/*"
   push:
     branches:
       - main
-    paths:
-      - "tools/*"
     tags:
       - "v[0-9]+.[0-9]+.[0-9]+"               # Push events to matching v*, i.e. v1.0, v20.15.10
       - "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"  # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10

Makefile

@@ -3,6 +3,12 @@ PACKAGES=$(shell go list ./...)
 INCLUDE = -I=${GOPATH}/src/github.com/cometbft/cometbft-db -I=${GOPATH}/src -I=${GOPATH}/src/github.com/gogo/protobuf/protobuf
 DOCKER_TEST_IMAGE ?= cometbft/cometbft-db-testing
 DOCKER_TEST_IMAGE_VERSION ?= latest
+NON_INTERACTIVE ?= 0
+DOCKER_TEST_INTERACTIVE_FLAGS ?= -it
+
+ifeq (1,$(NON_INTERACTIVE))
+	DOCKER_TEST_INTERACTIVE_FLAGS :=
+endif
 
 export GO111MODULE = on
 
@@ -70,9 +76,9 @@ docker-test-image:
 .PHONY: docker-test-image
 
 # Runs the same test as is executed in CI, but locally.
-docker-test: docker-test-image
-	@echo "--> Running all tests with all databases with Docker"
-	@docker run -it --rm --name cometbft-db-test \
+docker-test:
+	@echo "--> Running all tests with all databases with Docker (interactive flags: \"$(DOCKER_TEST_INTERACTIVE_FLAGS)\")"
+	@docker run $(DOCKER_TEST_INTERACTIVE_FLAGS) --rm --name cometbft-db-test \
 		-v `pwd`:/cometbft \
 		-w /cometbft \
 		--entrypoint "" \

README.md

@@ -79,6 +79,7 @@ local machine, use `make test-all` to test them all.
 To test all databases within a Docker container, run:
 
 ```bash
+make docker-test-image
 make docker-test
 ```