timmypidashev/web
1
0
Fork 0
mirror of https://github.com/timmypidashev/web.git synced 2026-04-14 19:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update compose

Browse Source
This commit is contained in:
Timothy Pidashev
2025-04-21 11:47:09 -07:00
parent b40134833b
commit 04489a53d1
4 changed files with 14 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.caddy/Caddyfile
View File

@@ -1,5 +0,0 @@
timmypidashev.dev {
tls pidashev.tim@gmail.com
reverse_proxy 127.0.0.1:3000
}

5
.caddy/Caddyfile.dev
View File

@@ -1,5 +0,0 @@
timmypidashev.local {
tls internal
reverse_proxy web:4321
}

27
.docker/Dockerfile.dev
View File

@@ -1,27 +0,0 @@
FROM node:22-alpine
ARG CONTAINER_WEB_VERSION
ARG ENVIRONMENT
ARG BUILD_DATE
ARG GIT_COMMIT
RUN set -eux \
& apk add \
--no-cache \
nodejs \
curl
RUN curl -L https://unpkg.com/@pnpm/self-installer | node
WORKDIR /app
COPY . .
RUN echo "PUBLIC_VERSION=${CONTAINER_WEB_VERSION}" > /app/.env && \
echo "PUBLIC_ENVIRONMENT=${ENVIRONMENT}" >> /app/.env && \
echo "PUBLIC_BUILD_DATE=${BUILD_DATE}" >> /app/.env && \
echo "PUBLIC_GIT_COMMIT=${GIT_COMMIT}" >> /app/.env
EXPOSE 3000
CMD ["pnpm", "run", "dev"]

28
Makefile
View File

@@ -3,11 +3,11 @@ PROJECT_AUTHORS := "Timothy Pidashev (timmypidashev) <pidashev.tim@gmail.c
PROJECT_VERSION := "v1.0.1" PROJECT_VERSION := "v1.0.1"
PROJECT_LICENSE := "MIT" PROJECT_LICENSE := "MIT"
PROJECT_SOURCES := "https://github.com/timmypidashev/web" PROJECT_SOURCES := "https://github.com/timmypidashev/web"
PROJECT_REGISTRY := "ghcr.io/timmypidashev/web" PROJECT_REGISTRY := "ghcr.io/timmypidashev"
PROJECT_ORGANIZATION := "org.opencontainers" PROJECT_ORGANIZATION := "org.opencontainers"
CONTAINER_WEB_NAME := "web" CONTAINER_WEB_NAME := "timmypidashev.dev"
CONTAINER_WEB_VERSION := "v1.0.1" CONTAINER_WEB_VERSION := "v2.1.0"
CONTAINER_WEB_LOCATION := "src/" CONTAINER_WEB_LOCATION := "src/"
CONTAINER_WEB_DESCRIPTION := "My portfolio website!" CONTAINER_WEB_DESCRIPTION := "My portfolio website!"
@@ -17,7 +17,7 @@ CONTAINER_WEB_DESCRIPTION := "My portfolio website!"
help: help:
@echo "Available targets:" @echo "Available targets:"
@echo " run - Runs the docker compose file with the specified environment (dev or release)" @echo " run - Runs the docker compose file with the specified environment (local or release)"
@echo " build - Builds the specified docker image with the appropriate environment" @echo " build - Builds the specified docker image with the appropriate environment"
@echo " push - Pushes the built docker image to the registry" @echo " push - Pushes the built docker image to the registry"
@echo " prune - Removes all built and cached docker images and containers" @echo " prune - Removes all built and cached docker images and containers"
@@ -25,19 +25,19 @@ help:
run: run:
# Arguments: # Arguments:
# [environment]: 'dev' or 'release' # [environment]: 'local' or 'release'
# #
# Explanation: # Explanation:
# * Runs the docker compose file with the specified environment(compose.dev.yml, or compose.release.yml) # * Runs the docker compose file with the specified environment(compose.local.yml, or compose.release.yml)
# * Passes all generated arguments to the compose file. # * Passes all generated arguments to the compose file.
# Make sure we have been given proper arguments. # Make sure we have been given proper arguments.
@if [ "$(word 2,$(MAKECMDGOALS))" = "dev" ]; then \ @if [ "$(word 2,$(MAKECMDGOALS))" = "local" ]; then \
echo "Running in development environment"; \ echo "Running in local environment"; \
elif [ "$(word 2,$(MAKECMDGOALS))" = "release" ]; then \ elif [ "$(word 2,$(MAKECMDGOALS))" = "release" ]; then \
echo "Running in release environment"; \ echo "Running in release environment"; \
else \ else \
echo "Invalid usage. Please use 'make run dev' or 'make run release'"; \ echo "Invalid usage. Please use 'make run local' or 'make run release'"; \
exit 1; \ exit 1; \
fi fi
@@ -47,7 +47,7 @@ run:
build: build:
# Arguments # Arguments
# [container]: Build context(which container to build ['all' to build every container defined]) # [container]: Build context(which container to build ['all' to build every container defined])
# [environment]: 'dev' or 'release' # [environment]: 'local' or 'release'
# #
# Explanation: # Explanation:
# * Builds the specified docker image with the appropriate environment. # * Builds the specified docker image with the appropriate environment.
@@ -155,19 +155,19 @@ define container_build
$(eval ENVIRONMENT := $(word 2,$1)) $(eval ENVIRONMENT := $(word 2,$1))
$(eval ARGS := $(shell echo $(args))) $(eval ARGS := $(shell echo $(args)))
$(eval VERSION := $(strip $(call container_version,$(CONTAINER)))) $(eval VERSION := $(strip $(call container_version,$(CONTAINER))))
$(eval TAG := $(CONTAINER):$(ENVIRONMENT)) $(eval TAG := $(PROJECT_NAME):$(ENVIRONMENT))
@echo "Building container: $(CONTAINER)" @echo "Building container: $(CONTAINER)"
@echo "Environment: $(ENVIRONMENT)" @echo "Environment: $(ENVIRONMENT)"
@echo "Version: $(VERSION)" @echo "Version: $(VERSION)"
@if [ "$(strip $(ENVIRONMENT))" != "dev" ] && [ "$(strip $(ENVIRONMENT))" != "release" ]; then \ @if [ "$(strip $(ENVIRONMENT))" != "local" ] && [ "$(strip $(ENVIRONMENT))" != "release" ]; then \
echo "Invalid environment. Please specify 'dev' or 'release'"; \ echo "Invalid environment. Please specify 'local' or 'release'"; \
exit 1; \ exit 1; \
fi fi
$(if $(filter $(strip $(ENVIRONMENT)),release), \ $(if $(filter $(strip $(ENVIRONMENT)),release), \
$(eval TAG := $(PROJECT_REGISTRY)/$(CONTAINER):$(VERSION)), \ $(eval TAG := $(PROJECT_REGISTRY)/$(PROJECT_NAME):$(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 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