Update date parsing on blog; fix Makefile

Makefile

@@ -17,26 +17,41 @@ CONTAINER_WEB_DESCRIPTION				:= "My portfolio website!"
 
 help:
 	@echo "Available targets:"
-	@echo "  run           - Runs the docker compose file with the specified environment (local, dev, preview, or release)"
+	@echo "  run           - Runs the docker compose file with the specified environment (dev or release)"
 	@echo "  build         - Builds the specified docker image with the appropriate environment"
 	@echo "  push          - Pushes the built docker image to the registry"
-	@echo "  pull					 - Pulls the latest specified docker image from the registry"
 	@echo "  prune         - Removes all built and cached docker images and containers"
 	@echo "  bump          - Bumps the project and container versions"
-	@echo "  exec          - Spawns a shell to execute commands from within a running container"
+
+run:
+	# Arguments:
+	# [environment]: 'dev' or 'release'
+	# 
+	# Explanation:
+	# * Runs the docker compose file with the specified environment(compose.dev.yml, or compose.release.yml)
+	# * Passes all generated arguments to the compose file.
+	
+	# Make sure we have been given proper arguments.
+	@if [ "$(word 2,$(MAKECMDGOALS))" = "dev" ]; then \
+		echo "Running in development environment"; \
+	elif [ "$(word 2,$(MAKECMDGOALS))" = "release" ]; then \
+		echo "Running in release environment"; \
+	else \
+		echo "Invalid usage. Please use 'make run dev' or 'make run release'"; \
+		exit 1; \
+	fi
+
+	docker compose -f compose.$(word 2,$(MAKECMDGOALS)).yml up --remove-orphans
+
 
 build:
 	# Arguments
 	# [container]: Build context(which container to build ['all' to build every container defined])
-	# [environment]: 'local', 'dev', 'preview', or 'release'
+	# [environment]: 'dev' or 'release'
 	#
 	# Explanation:
 	# * Builds the specified docker image with the appropriate environment.
 	# * Passes all generated arguments to docker build-kit.
-	# * Installs pre-commit hooks if in a git repository.
-	
-	# Install pre-commit hooks if in a git repository.
-	$(call install_precommit)
 	
 	# Extract container and environment inputted.
 	$(eval INPUT_TARGET := $(word 2,$(MAKECMDGOALS)))
@@ -49,33 +64,6 @@ build:
 		$(foreach container,$(containers),$(call container_build,$(container) $(INPUT_ENVIRONMENT))), \
 		$(call container_build,$(INPUT_CONTAINER) $(INPUT_ENVIRONMENT)))
 
-run:
-	# Arguments:
-	# [environment]: 'local', 'dev', 'preview', or 'release'
-	# 
-	# Explanation:
-	# * Runs the docker compose file with the specified environment(compose.local.yml, compose.dev.yml, compose.preview.yml, or compose.release.yml)
-	# * Passes all generated arguments to the compose file.
-	# * Installs pre-commit hooks if in a git repository.
-	
-	# Install pre-commit hooks if in a git repository.
-	$(call install_precommit)
-
-	# Make sure we have been given proper arguments.
-	@if [ "$(word 2,$(MAKECMDGOALS))" = "local" ]; then \
-		echo "Running in local environment"; \
-		docker compose -f compose.$(word 2,$(MAKECMDGOALS)).yml up --watch --remove-orphans; \
-	elif [ "$(word 2,$(MAKECMDGOALS))" = "preview" ]; then \
-		echo "Running in preview environment"; \
-		docker compose -f compose.$(word 2,$(MAKECMDGOALS)).yml up --remove-orphans; \
-	elif [ "$(word 2,$(MAKECMDGOALS))" = "release" ]; then \
-		echo "Running in release environment"; \
-		docker compose -f compose.$(word 2,$(MAKECMDGOALS)).yml up --remove-orphans; \
-	else \
-		echo "Invalid usage. Please use 'make run <'local', 'dev', 'preview', or 'release'>"; \
-		exit 1; \
-	fi 
-
 push:
 	# Arguments
 	# [container]: Push context(which container to push to the registry)
@@ -93,45 +81,7 @@ push:
 	# NOTE: docker will complain if the container tag is invalid, no need to validate here.
 	@docker push $(PROJECT_REGISTRY)/$(INPUT_CONTAINER):$(INPUT_VERSION)
 
-pull:
-	# TODO: FIX COMMAND PULL
-	# Arguments
-	# [container]: Pull context (which container to pull from the registry)
-	# [environment]: 'local', 'dev', 'preview', or 'release'
-	#
-	# Explanation:
-	# * Pulls the specified container version from the registry defined in the user configuration.
-	# * Uses sed and basename to extract the repository name.
-	
-	# Extract container and environment inputted.
-	$(eval INPUT_TARGET := $(word 2,$(MAKECMDGOALS)))
-	$(eval INPUT_CONTAINER := $(firstword $(subst :, ,$(INPUT_TARGET))))
-	$(eval INPUT_ENVIRONMENT := $(lastword $(subst :, ,$(INPUT_TARGET))))
-	
-	# Validate environment
-	@if [ "$(strip $(INPUT_ENVIRONMENT))" != "local" ] [ "$(strip $(INPUT_ENVIRONMENT))" != "dev" ] && [ "$(strip $(INPUT_ENVIRONMENT))" != "preview" ] && [ "$(strip $(INPUT_ENVIRONMENT))" != "release" ]; then \
-			echo "Invalid environment. Please specify 'local', 'dev', 'preview', or 'release'"; \
-			exit 1; \
-	fi
-	
-	# Extract repository name from PROJECT_SOURCES using sed and basename
-	$(eval REPO_NAME := $(shell echo "$(PROJECT_SOURCES)" | sed 's|https://github.com/[^/]*/||' | sed 's/\.git$$//' | xargs basename))
-	
-	# Determine the correct tag based on the environment and container
-	$(eval TAG := $(if $(filter $(INPUT_ENVIRONMENT),local),\
-									 $(INPUT_CONTAINER):$(INPUT_ENVIRONMENT),\
-								 $(if $(filter $(INPUT_CONTAINER),$(REPO_NAME)),\
-									 $(PROJECT_REGISTRY):$(if $(filter $(INPUT_ENVIRONMENT),prev),prev,$(call container_version,$(INPUT_CONTAINER))),\
-									 $(PROJECT_REGISTRY)/$(INPUT_CONTAINER):$(if $(filter $(INPUT_ENVIRONMENT),prev),prev,$(call container_version,$(INPUT_CONTAINER))))))
-	
-	# Pull the specified container from the registry
-	@echo "Pulling container: $(INPUT_CONTAINER)"
-	@echo "Environment: $(INPUT_ENVIRONMENT)"
-	@echo "Tag: $(TAG)"
-	@docker pull $(TAG)
-
 prune:
-	# TODO: IMPLEMENT COMMAND PRUNE
 	# Removes all built and cached docker images and containers.
 
 bump:
@@ -165,21 +115,6 @@ bump:
 	perl -pi -e 's/^PROJECT_VERSION\s*:=\s*\K.*/"v$(shell docker run usvc/semver:latest bump $(INPUT_SEMANTIC_TYPE) $(OLD_PROJECT_VERSION))"/ if /^PROJECT_VERSION\s*:=/' Makefile;
 	perl -pi -e 's/^CONTAINER_$(shell echo $(INPUT_CONTAINER) | tr a-z A-Z)_VERSION\s*:=\s*\K.*/"v$(shell docker run usvc/semver:latest bump $(INPUT_SEMANTIC_TYPE) $(OLD_CONTAINER_VERSION))"/ if /^CONTAINER_$(shell echo $(INPUT_CONTAINER) | tr a-z A-Z)_VERSION\s*:=/' Makefile;
 	
-	# Commit and push to git origin
-	git add .
-	git commit -a -S -m "Bump $(INPUT_CONTAINER) to v$(shell docker run usvc/semver:latest bump $(INPUT_SEMANTIC_TYPE) $(OLD_PROJECT_VERSION))"
-	git push
-	git push origin tag v$(shell docker run usvc/semver:latest bump $(INPUT_SEMANTIC_TYPE) $(OLD_PROJECT_VERSION))
-
-exec:
-	# Extract container and environment inputted.
-	$(eval INPUT_TARGET := $(word 2,$(MAKECMDGOALS)))
-	$(eval INPUT_CONTAINER := $(firstword $(subst :, ,$(INPUT_TARGET))))
-	$(eval INPUT_ENVIRONMENT := $(lastword $(subst :, ,$(INPUT_TARGET))))
-	$(eval COMPOSE_FILE := compose.$(INPUT_ENVIRONMENT).yml)
-	
-	docker compose -f $(COMPOSE_FILE) run --service-ports $(INPUT_CONTAINER) sh
-
 # This function generates Docker build arguments based on variables defined in the Makefile.
 # It extracts variable assignments, removes whitespace, and formats them as build arguments.
 # Additionally, it appends any custom shell generated arguments defined below.
@@ -194,7 +129,6 @@ define args
             gsub(":", "", $$1); \
             printf "--build-arg %s=%s ", $$1, $$2 \
         }') \
-				--build-arg ENVIRONMENT='"$(shell echo $(INPUT_ENVIRONMENT))"' \
         --build-arg BUILD_DATE='"$(shell date)"' \
 		--build-arg GIT_COMMIT='"$(shell git rev-parse HEAD)"'
 endef
@@ -221,19 +155,22 @@ define container_build
 	$(eval ENVIRONMENT := $(word 2,$1))
 	$(eval ARGS := $(shell echo $(args)))
 	$(eval VERSION := $(strip $(call container_version,$(CONTAINER))))
-	$(eval PROJECT := $(strip $(subst ",,$(PROJECT_NAME))))
+	$(eval TAG := $(CONTAINER):$(ENVIRONMENT))
-	$(eval TAG := $(PROJECT).$(CONTAINER):$(ENVIRONMENT))
 
 	@echo "Building container: $(CONTAINER)"
 	@echo "Environment: $(ENVIRONMENT)"
 	@echo "Version: $(VERSION)"
 
-	@if [ "$(strip $(ENVIRONMENT))" != "local" ] && [ "$(strip $(ENVIRONMENT))" != "dev" ] && [ "$(strip $(ENVIRONMENT))" != "preview" ] && [ "$(strip $(ENVIRONMENT))" != "release" ]; then \
+	@if [ "$(strip $(ENVIRONMENT))" != "dev" ] && [ "$(strip $(ENVIRONMENT))" != "release" ]; then \
-        echo "Invalid environment. Please specify 'local', 'dev', 'preview', or 'release'"; \
+        echo "Invalid environment. Please specify 'dev' or 'release'"; \
         exit 1; \
     fi
 
-	docker buildx build --no-cache --load -t $(TAG) -f .docker/Dockerfile.$(ENVIRONMENT) ./$(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/. $(ARGS) $(call labels,$(shell echo $(CONTAINER_NAME) | tr '[:lower:]' '[:upper:]')) --debug
+	$(if $(filter $(strip $(ENVIRONMENT)),release), \
+		$(eval TAG := $(PROJECT_REGISTRY)/$(CONTAINER):$(VERSION)), \
+	)
+
+	docker buildx build --load -t $(TAG) -f .docker/Dockerfile.$(ENVIRONMENT) ./$(strip $(subst $(SPACE),,$(call container_location,$(CONTAINER))))/. $(ARGS) $(call labels,$(shell echo $(CONTAINER_NAME) | tr '[:lower:]' '[:upper:]')) --no-cache
 endef
 
 define container_location
@@ -241,26 +178,9 @@ define container_location
     $(CONTAINER_$(CONTAINER_NAME)_LOCATION)
 endef
 
-define container_name
-		$(strip $(shell echo '$(1)' | tr '[:upper:]' '[:lower:]' | tr -d '[:space:]'))
-endef
-
 define container_version
 	$(strip $(eval CONTAINER_NAME := $(shell echo $(1) | tr '[:lower:]' '[:upper:]'))) \
 	$(if $(CONTAINER_$(CONTAINER_NAME)_VERSION), \
 		$(shell echo $(strip $(strip $(CONTAINER_$(CONTAINER_NAME)_VERSION))) | tr -d '[:space:]'), \
 		$(error Version data for container $(1) not found))
 endef
-
-define install_precommit
-	$(strip \
-		$(shell \
-			if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then \
-				pre-commit install > /dev/null 2>&1; \
-			fi \
-		) \
-	)
-endef
-
-%:
-	@:

src/src/content/blog/my-first-post.mdx

@@ -3,7 +3,7 @@ title: My First Post!
 description: A quick introduction
 author: Timothy Pidashev
 tags: [greeting]
-date: January 9, 2025
+date: 2025-01-09
 image: "/blog/my-first-post/thumbnail.png"
 imagePosition: "center 30%"
 ---

src/src/pages/blog/index.astro

@@ -1,14 +1,13 @@
 ---
 import { getCollection } from "astro:content";
 import ContentLayout from "@/layouts/content.astro";
-
 import { BlogPostList } from "@/components/blog/post-list";
 
 const posts = (await getCollection("blog", ({ data }) => {
   return data.isDraft !== true;
-})).sort(
+})).sort((a, b) => {
-	(a, b) => b.data.pubDate.valueOf() - a.data.pubDate.valueOf()
+  return new Date(b.data.date).valueOf() - new Date(a.data.date).valueOf()
-);
+});
 ---
 
 <ContentLayout 

src/src/pages/index.astro

@@ -7,7 +7,7 @@ import Hero from "@/components/hero";
 
 <IndexLayout 
   title="Timothy Pidashev" 
-  description="Turning coffee into code since 2018."
+  description="Software engineer passionate about systems programming, artificial intelligence, and building innovative solutions. Personal site featuring my projects, technical blog, and research."
 >
   <Hero client:load />
 </IndexLayout>