From f7bf720b6c31a7344477f5cba262066ea0401f03 Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Fri, 21 Aug 2026 10:10:30 +0200 Subject: [PATCH] refactor: simplify Makefile by removing unused targets and variables Remove container-image/delete and container-image/push targets as these operations are handled by CI workflows. Consolidate LATEX_IMAGE_REGISTRY_USER and LATEX_IMAGE_NAMESPACE into a single LATEX_IMAGE_REPOSITORY variable and drop the unused CONTAINER_RUNTIME definition. Co-authored-by: Copilot --- Makefile | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/Makefile b/Makefile index cb7fd7e..aff24f7 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,20 @@ -# CONTAINER_RUNTIME -# The CONTAINER_RUNTIME variable will be used to specified the path to a -# container runtime. This is needed to start and run a container image. -CONTAINER_RUNTIME?=$(shell which podman) - # ArchLinux LATEX_IMAGE_REGISTRY_HOST?=git.cryptic.systems -LATEX_IMAGE_REGISTRY_USER?=volker.raschek -LATEX_IMAGE_NAMESPACE?=${LATEX_IMAGE_REGISTRY_USER} -LATEX_IMAGE_REPOSITORY:=latex +LATEX_IMAGE_REPOSITORY?=volker.raschek/latex LATEX_IMAGE_VERSION?=latest -LATEX_IMAGE_FULLY_QUALIFIED=${LATEX_IMAGE_REGISTRY_HOST}/${LATEX_IMAGE_NAMESPACE}/${LATEX_IMAGE_REPOSITORY}:${LATEX_IMAGE_VERSION} +LATEX_IMAGE_FULLY_QUALIFIED=${LATEX_IMAGE_REGISTRY_HOST}/${LATEX_IMAGE_REPOSITORY}:${LATEX_IMAGE_VERSION} # BUILD LATEX CONTAINER IMAGE # ============================================================================== -PHONY:=container-image/build/arch-linux +PHONY+=container-image/build/arch-linux container-image/build/arch-linux: - ${CONTAINER_RUNTIME} build \ + podman build \ --file Dockerfile.archlinux \ --no-cache \ --pull \ --tag ${LATEX_IMAGE_FULLY_QUALIFIED} \ . -# DELETE LATEX CONTAINER IMAGE -# ============================================================================== -PHONY:=container-image/delete/arch-linux -container-image/delete/arch-linux: - - ${CONTAINER_RUNTIME} image rm ${LATEX_IMAGE_FULLY_QUALIFIED} - -# PUSH LATEX CONTAINER IMAGE -# ============================================================================== -PHONY+=container-image/push/arch-linux -container-image/push/arch-linux: - echo ${LATEX_IMAGE_REGISTRY_PASSWORD} | ${CONTAINER_RUNTIME} login ${LATEX_IMAGE_REGISTRY_HOST} --username ${LATEX_IMAGE_REGISTRY_USER} --password-stdin - ${CONTAINER_RUNTIME} push ${LATEX_IMAGE_FULLY_QUALIFIED} - # PHONY # ============================================================================== # Declare the contents of the PHONY variable as phony. We keep that information