feat: keep up with technical debt

Makefile

@@ -1,46 +1,40 @@
-CI_COMPOSE=FIXUID=$(shell id -u) FIXGID=$(shell id -g) docker-compose -f docker-compose.yml
-HYDRA_SQL_SHELL_USER ?= www-data:
-DOCKER_CMD ?=
-DOCKER_IMAGE_NAME ?= login-app-sql_hydra-sql
-up:
-	FIXUID=$(shell id -u) FIXGID=$(shell id -g) docker-compose up --build
 
-down:
-	docker-compose down -v
+IMAGE_REPO ?= reg.cadoles.com/cadoles
+IMAGES_DIR := misc/images
+IMAGES := $(foreach file, $(wildcard $(IMAGES_DIR)/*), $(basename $(notdir $(file))))
 
-purge:
-	docker-compose down -v --remove-orphans --rmi local
+TRIVY_ARGS ?=
 
-hydra-sql-shell:
-	$(CI_COMPOSE) exec \
-		-u "$(HYDRA_SQL_SHELL_USER)" \
-		hydra-sql \
-		/bin/bash
+build-image: $(foreach image, $(IMAGES), build-image-$(image))
 
+build-image-%:
+	docker build \
+		-t "${IMAGE_REPO}/$*:latest" \
+		-f ${IMAGES_DIR}/$*/Dockerfile \
+		.
 
-APP_LOCALES ?= fr,en
-HYDRA_ADMIN_BASE_URL ?= http://hydra:4445
-TRUSTED_PROXIES ?= 127.0.0.1,REMOTE_ADDR,localhost
-ISSUER_URL ?= http://localhost:8000
-BASE_URL ?= http://localhost:8080
-DB_USER ?= lasql
-DB_PASSWORD ?= lasql
-DEFAULT_LOCALE ?= fr
-BDD ?= postgres
-DSN_REMOTE_DATABASE=mysql:host=mariadb;port=3306;dbname=lasql
+scan-image: $(foreach image, $(IMAGES), scan-image-$(image))
 
-up-mysql:
-	docker run \
-		-it --rm \
-		-p 8080:80 \
-		-e APP_LOCALES=$(APP_LOCALES) \
-		-e HYDRA_ADMIN_BASE_URL=$(HYDRA_ADMIN_BASE_URL) \
-		-e TRUSTED_PROXIES=$(TRUSTED_PROXIES) \
-		-e ISSUER_URL=$(ISSUER_URL) \
-		-e BASE_URL=$(BASE_URL) \
-		-e DB_USER=$(DB_USER) \
-		-e DB_PASSWORD=$(DB_PASSWORD) \
-		-e DEFAULT_LOCALE=$(DEFAULT_LOCALE) \
-		-e DSN_REMOTE_DATABASE=$(DSN_REMOTE_DATABASE) \
-		$(DOCKER_IMAGE_NAME):latest \
-		$(DOCKER_CMD)
+scan-image-%: tools/trivy/bin/trivy
+	mkdir -p .trivy/.cache
+	tools/trivy/bin/trivy --cache-dir .trivy/.cache --ignorefile .trivyignore.yaml image  $(TRIVY_ARGS) $(IMAGE_REPO)/$*:latest
+
+release-image: $(foreach image, $(IMAGES), release-image-$(image))
+
+release-image-%: .mktools
+	@[ ! -z "$(MKT_PROJECT_VERSION)" ] || ( echo "Just downloaded mktools. Please re-run command."; exit 1 )
+	docker tag "${IMAGE_REPO}/$*:latest" "${IMAGE_REPO}/$*:$(MKT_PROJECT_VERSION)"
+	docker tag "${IMAGE_REPO}/$*:latest" "${IMAGE_REPO}/$*:$(MKT_PROJECT_SHORT_VERSION)"
+	docker push "${IMAGE_REPO}/$*:$(MKT_PROJECT_VERSION)"
+	docker push "${IMAGE_REPO}/$*:$(MKT_PROJECT_SHORT_VERSION)"
+	docker push "${IMAGE_REPO}/$*:latest"
+
+tools/trivy/bin/trivy:
+	mkdir -p tools/trivy/bin
+	curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b ./tools/trivy/bin v0.47.0
+
+.mktools:
+	rm -rf .mktools
+	curl -q https://forge.cadoles.com/Cadoles/mktools/raw/branch/master/install.sh | TASKS="version" $(SHELL)
+
+-include .mktools/*.mk