Some fixes for the container and helm build/install

Author: MrMatAP

.idea/misc.xml

@@ -5,9 +5,12 @@
 GIT_SHA := $(shell git rev-parse --short HEAD)
 VERSION ?= 0.0.0-dev0.${GIT_SHA}
 PYTHON_VERSION := $(shell echo "${VERSION}" | sed -e 's/-dev0\./-dev0+/')
+WHEEL_VERSION := $(shell echo "${VERSION}" | sed -e 's/-dev0\./.dev0+/')
+
+ROOT_PATH := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
 
 PYTHON_SOURCES := $(shell find src/mrmat_python_api_fastapi -name '*.py')
-PYTHON_TARGET := dist/mrmat_python_api_fastapi-${PYTHON_VERSION}-py3-none-any.whl
+PYTHON_TARGET := dist/mrmat_python_api_fastapi-${WHEEL_VERSION}-py3-none-any.whl
 CONTAINER_SOURCES := $(shell find var/container)
 HELM_SOURCES := $(shell find var/helm)
 HELM_TARGET := dist/mrmat-python-api-fastapi-$(VERSION).tgz
@@ -31,7 +34,8 @@ container: $(PYTHON_TARGET) $(CONTAINER_SOURCES)
 		-f var/container/Dockerfile \
 		-t localhost:5001/mrmat-python-api-fastapi:$(VERSION) \
 		--build-arg MRMAT_VERSION=$(VERSION) \
-		.
+		--build-arg WHEEL=$(PYTHON_TARGET) \
+		$(ROOT_PATH)
 	docker push localhost:5001/mrmat-python-api-fastapi:$(VERSION)
 
 helm-install: $(HELM_TARGET)

.idea/mrmat-python-api-fastapi.iml

@@ -3,5 +3,5 @@
 [![Build](https://github.com/MrMatOrg/mrmat-python-api-fastapi/actions/workflows/build.yml/badge.svg)](https://github.com/MrMatOrg/mrmat-python-api-fastapi/actions/workflows/build.yml)
 
 
-Boilerplate (and playground) for a code-first Python FastAPI API, with all the bells and whistles we've come to expect
+Boilerplate (and playground) for a code-first Python FastAPI API, with all the bells and whistles we've come to expect.
 

Makefile

@@ -1,7 +1,8 @@
 FROM python:3.12-alpine AS build
 ARG MRMAT_VERSION="0.0.0.dev0"
-ADD dist/mrmat_python_api_fastapi-*-py3-none-any.whl /
-RUN pip install --user /mrmat_python_api_fastapi-*-py3-none-any.whl
+ARG WHEEL=""
+ADD "$WHEEL" /
+RUN pip install --user /mrmat_python_api_fastapi-*.whl
 
 FROM python:3.12-alpine
 ARG MRMAT_VERSION="0.0.0.dev0"

README.md

@@ -11,7 +11,7 @@ serviceAccount:
 pod:
   name: mrmat-python-api-fastapi
   replicas: 2
-  repository: mrmat-registry:5000/mrmat-python-api-fastapi
+  repository: registry:5000/mrmat-python-api-fastapi
   imagePullPolicy: IfNotPresent
   port: 8000