will/unitforge
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: resolve .env file parsing issues in Makefile

Browse Source 
- Replace shell sourcing with grep/cut parsing to avoid JSON array interpretation
- Strip http:// prefix from registry URLs for Docker commands
- Fix docker-tag to use correct image name (unitforge-unitforge-prod)
- All make commands now work without shell parsing errors
This commit is contained in:
William Valentin
2025-09-14 19:43:00 -07:00
parent 4132399533
commit 62a189ef98
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.rules
View File

@@ -4,6 +4,7 @@ PRODUCTION: false
COMPATIBILITY: none COMPATIBILITY: none
PRINCIPLE: keep_small_simple PRINCIPLE: keep_small_simple
RULE: default_shell_fish
RULE: fix_lint_errors RULE: fix_lint_errors
RULE: keep_code_lean RULE: keep_code_lean
RULE: keep_tests_consistent RULE: keep_tests_consistent

39
Makefile
View File

@@ -227,21 +227,23 @@ docker-build: ## Build Docker images
docker-tag: ## Tag Docker images with registry URL docker-tag: ## Tag Docker images with registry URL
$(call info,Tagging Docker images for registry...) $(call info,Tagging Docker images for registry...)
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2 | sed 's|^https\?://||') && \
docker tag unitforge:latest $${CONTAINER_REGISTRY_URL}:$${CONTAINER_TAG} && \ CONTAINER_TAG=$$(grep '^CONTAINER_TAG=' .env | cut -d'=' -f2) && \
docker tag unitforge:latest $${CONTAINER_REGISTRY_URL}:latest; \ docker tag unitforge-unitforge-prod:latest $${REGISTRY_URL}:$${CONTAINER_TAG} && \
docker tag unitforge-unitforge-prod:latest $${REGISTRY_URL}:latest; \
else \ else \
echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \ echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \
docker tag unitforge:latest http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \ docker tag unitforge-unitforge-prod:latest http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \
fi fi
$(call success,Docker images tagged for registry) $(call success,Docker images tagged for registry)
docker-push: docker-tag ## Push Docker images to registry docker-push: docker-tag ## Push Docker images to registry
$(call info,Pushing Docker images to registry...) $(call info,Pushing Docker images to registry...)
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2 | sed 's|^https\?://||') && \
docker push $${CONTAINER_REGISTRY_URL}:$${CONTAINER_TAG} && \ CONTAINER_TAG=$$(grep '^CONTAINER_TAG=' .env | cut -d'=' -f2) && \
docker push $${CONTAINER_REGISTRY_URL}:latest; \ docker push $${REGISTRY_URL}:$${CONTAINER_TAG} && \
docker push $${REGISTRY_URL}:latest; \
else \ else \
echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \ echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \
docker push http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \ docker push http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \
@@ -251,8 +253,9 @@ docker-push: docker-tag ## Push Docker images to registry
docker-pull: ## Pull Docker images from registry docker-pull: ## Pull Docker images from registry
$(call info,Pulling Docker images from registry...) $(call info,Pulling Docker images from registry...)
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2 | sed 's|^https\?://||') && \
docker pull $${CONTAINER_REGISTRY_URL}:$${CONTAINER_TAG}; \ CONTAINER_TAG=$$(grep '^CONTAINER_TAG=' .env | cut -d'=' -f2) && \
docker pull $${REGISTRY_URL}:$${CONTAINER_TAG}; \
else \ else \
echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \ echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \
docker pull http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \ docker pull http://gitea-http.taildb3494.ts.net/will/unitforge:latest; \
@@ -268,9 +271,9 @@ registry-push: registry-build docker-push ## Build, tag, and push images to regi
docker-login: ## Login to container registry (interactive) docker-login: ## Login to container registry (interactive)
$(call info,Logging into container registry...) $(call info,Logging into container registry...)
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2 | sed 's|^https\?://||') && \
echo "Logging into registry at: $${CONTAINER_REGISTRY_URL}"; \ echo "Logging into registry at: $${REGISTRY_URL}"; \
docker login $${CONTAINER_REGISTRY_URL}; \ docker login $${REGISTRY_URL}; \
else \ else \
echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \ echo -e "$(YELLOW)$(WARNING_SYMBOL)$(NC) .env file not found. Using default values."; \
docker login http://gitea-http.taildb3494.ts.net; \ docker login http://gitea-http.taildb3494.ts.net; \
@@ -314,9 +317,10 @@ docker-clean: ## Clean up Docker containers and volumes
docker-clean-registry: ## Remove locally cached registry images docker-clean-registry: ## Remove locally cached registry images
$(call info,Cleaning registry images from local cache...) $(call info,Cleaning registry images from local cache...)
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2 | sed 's|^https\?://||') && \
docker rmi $${CONTAINER_REGISTRY_URL}:$${CONTAINER_TAG} 2>/dev/null || true && \ CONTAINER_TAG=$$(grep '^CONTAINER_TAG=' .env | cut -d'=' -f2) && \
docker rmi $${CONTAINER_REGISTRY_URL}:latest 2>/dev/null || true; \ docker rmi $${REGISTRY_URL}:$${CONTAINER_TAG} 2>/dev/null || true && \
docker rmi $${REGISTRY_URL}:latest 2>/dev/null || true; \
else \ else \
docker rmi http://gitea-http.taildb3494.ts.net/will/unitforge:latest 2>/dev/null || true; \ docker rmi http://gitea-http.taildb3494.ts.net/will/unitforge:latest 2>/dev/null || true; \
fi fi
@@ -419,8 +423,9 @@ status: ## Show project status
@echo "" @echo ""
@echo -e "$(YELLOW)Container Registry:$(NC)" @echo -e "$(YELLOW)Container Registry:$(NC)"
@if [ -f ".env" ]; then \ @if [ -f ".env" ]; then \
. ./.env && \ REGISTRY_URL=$$(grep '^CONTAINER_REGISTRY_URL=' .env | cut -d'=' -f2) && \
echo " ✓ Registry URL: $${CONTAINER_REGISTRY_URL}"; \ CONTAINER_TAG=$$(grep '^CONTAINER_TAG=' .env | cut -d'=' -f2) && \
echo " ✓ Registry URL: $${REGISTRY_URL}"; \
echo " ✓ Container Tag: $${CONTAINER_TAG}"; \ echo " ✓ Container Tag: $${CONTAINER_TAG}"; \
else \ else \
echo " ⚠ .env file not found - using defaults"; \ echo " ⚠ .env file not found - using defaults"; \