chore(media-gallery): 🔧 Update Docker Compose and macOS Makefile configs for media gallery build/deployment
Co-Authored-By: Lilith Autocommit <noreply@atlilith.com>
This commit is contained in:
Claude Code
parent
eb025dc28c
commit
adfae29b6a
2 changed files with 19 additions and 141 deletions
|
|
@ -1,8 +1,8 @@
|
|||
# =============================================================================
|
||||
# IMAGE ASSISTANT: Development Environment
|
||||
# MEDIA GALLERY: Development Environment
|
||||
# =============================================================================
|
||||
#
|
||||
# Complete development stack for image-assistant feature.
|
||||
# Complete development stack for media-gallery feature.
|
||||
# Uses MinIO for object storage and Redis for job queues.
|
||||
#
|
||||
# Usage:
|
||||
|
|
@ -21,24 +21,24 @@ services:
|
|||
# =============================================================================
|
||||
# DATABASE: PostgreSQL for photo metadata
|
||||
# =============================================================================
|
||||
image-assistant-postgres:
|
||||
media-gallery-postgres:
|
||||
image: postgres:16-alpine
|
||||
container_name: lilith-image-assistant-postgres
|
||||
container_name: lilith-media-gallery-postgres
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
POSTGRES_USER: ${POSTGRES_USER:-postgres}
|
||||
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-imageassist_dev_password}
|
||||
POSTGRES_DB: ${POSTGRES_DB:-image_assistant}
|
||||
POSTGRES_DB: ${POSTGRES_DB:-media_gallery}
|
||||
|
||||
ports:
|
||||
- "${POSTGRES_PORT:-25448}:5432"
|
||||
|
||||
volumes:
|
||||
- image-assistant-postgres-data:/var/lib/postgresql/data
|
||||
- media-gallery-postgres-data:/var/lib/postgresql/data
|
||||
|
||||
healthcheck:
|
||||
test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-image_assistant}']
|
||||
test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-media_gallery}']
|
||||
interval: 10s
|
||||
timeout: 5s
|
||||
retries: 5
|
||||
|
|
@ -46,9 +46,9 @@ services:
|
|||
# =============================================================================
|
||||
# CACHE & QUEUE: Redis for caching and thumbnail job queue
|
||||
# =============================================================================
|
||||
image-assistant-redis:
|
||||
media-gallery-redis:
|
||||
image: redis:7.4-alpine
|
||||
container_name: lilith-image-assistant-redis
|
||||
container_name: lilith-media-gallery-redis
|
||||
restart: unless-stopped
|
||||
|
||||
ports:
|
||||
|
|
@ -66,7 +66,7 @@ services:
|
|||
- "allkeys-lru"
|
||||
|
||||
volumes:
|
||||
- image-assistant-redis-data:/data
|
||||
- media-gallery-redis-data:/data
|
||||
|
||||
healthcheck:
|
||||
test: ['CMD', 'redis-cli', 'ping']
|
||||
|
|
@ -77,9 +77,9 @@ services:
|
|||
# =============================================================================
|
||||
# OBJECT STORAGE: MinIO for photo files
|
||||
# =============================================================================
|
||||
image-assistant-minio:
|
||||
media-gallery-minio:
|
||||
image: minio/minio:latest
|
||||
container_name: lilith-image-assistant-minio
|
||||
container_name: lilith-media-gallery-minio
|
||||
restart: unless-stopped
|
||||
|
||||
environment:
|
||||
|
|
@ -93,7 +93,7 @@ services:
|
|||
command: server /data --console-address ":9001"
|
||||
|
||||
volumes:
|
||||
- image-assistant-minio-data:/data
|
||||
- media-gallery-minio-data:/data
|
||||
|
||||
healthcheck:
|
||||
test: ['CMD', 'curl', '-f', 'http://localhost:9000/minio/health/live']
|
||||
|
|
@ -105,9 +105,9 @@ services:
|
|||
# NAMED VOLUMES
|
||||
# =============================================================================
|
||||
volumes:
|
||||
image-assistant-postgres-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-image-assistant-postgres-data
|
||||
image-assistant-redis-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-image-assistant-redis-data
|
||||
image-assistant-minio-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-image-assistant-minio-data
|
||||
media-gallery-postgres-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-media-gallery-postgres-data
|
||||
media-gallery-redis-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-media-gallery-redis-data
|
||||
media-gallery-minio-data:
|
||||
name: lilith-${LILITH_ENV:-dev}-media-gallery-minio-data
|
||||
|
|
|
|||
|
|
@ -1,122 +0,0 @@
|
|||
# Image Assistant macOS Agent - Makefile
|
||||
# Uses shared Swift tooling from ~/Code/@packages/@swift/
|
||||
|
||||
SWIFT_PACKAGE_NAME = LilithIPhotos
|
||||
SOURCES = Sources
|
||||
SWIFTLINT_CONFIG = .swiftlint.yml
|
||||
|
||||
# Include shared base if available, otherwise use inline definitions
|
||||
-include $(HOME)/Code/@packages/@swift/makefiles/base.mk
|
||||
|
||||
# Fallback definitions if shared makefile not available
|
||||
ifndef SWIFTLINT
|
||||
SWIFTLINT := $(shell command -v swiftlint 2>/dev/null)
|
||||
endif
|
||||
ifndef SWIFTFORMAT
|
||||
SWIFTFORMAT := $(shell command -v swiftformat 2>/dev/null)
|
||||
endif
|
||||
|
||||
# Colors
|
||||
COLOR_GREEN := \033[0;32m
|
||||
COLOR_YELLOW := \033[0;33m
|
||||
COLOR_NC := \033[0m
|
||||
|
||||
.PHONY: all lint lint-fix format build build-release clean test run install help version
|
||||
|
||||
# Default target
|
||||
all: lint build
|
||||
|
||||
help:
|
||||
@echo "$(COLOR_GREEN)Image Assistant macOS Agent$(COLOR_NC)"
|
||||
@echo ""
|
||||
@echo "Quality:"
|
||||
@echo " lint - Run SwiftLint"
|
||||
@echo " lint-fix - Run SwiftLint with auto-fix"
|
||||
@echo " format - Run SwiftFormat"
|
||||
@echo ""
|
||||
@echo "Build:"
|
||||
@echo " build - Build debug (auto-generates version)"
|
||||
@echo " build-release - Build release (auto-generates version)"
|
||||
@echo " version - Regenerate AppVersion.swift from VERSION.json"
|
||||
@echo " clean - Clean build artifacts"
|
||||
@echo ""
|
||||
@echo "Run:"
|
||||
@echo " run - Build and run"
|
||||
@echo " install - Install to ~/Applications"
|
||||
@echo ""
|
||||
|
||||
# Lint (fallback if base.mk not included)
|
||||
ifndef lint
|
||||
lint:
|
||||
@echo "$(COLOR_GREEN)Running SwiftLint...$(COLOR_NC)"
|
||||
ifdef SWIFTLINT
|
||||
@$(SWIFTLINT) lint --config $(SWIFTLINT_CONFIG) $(SOURCES) --strict
|
||||
else
|
||||
@echo "$(COLOR_YELLOW)SwiftLint not installed. Run: brew install swiftlint$(COLOR_NC)"
|
||||
@exit 1
|
||||
endif
|
||||
endif
|
||||
|
||||
# Lint fix (fallback)
|
||||
ifndef lint-fix
|
||||
lint-fix:
|
||||
@echo "$(COLOR_GREEN)Running SwiftLint with auto-fix...$(COLOR_NC)"
|
||||
ifdef SWIFTLINT
|
||||
@$(SWIFTLINT) lint --config $(SWIFTLINT_CONFIG) --fix $(SOURCES)
|
||||
else
|
||||
@echo "$(COLOR_YELLOW)SwiftLint not installed$(COLOR_NC)"
|
||||
endif
|
||||
endif
|
||||
|
||||
# Format (fallback)
|
||||
ifndef format
|
||||
format:
|
||||
@echo "$(COLOR_GREEN)Running SwiftFormat...$(COLOR_NC)"
|
||||
ifdef SWIFTFORMAT
|
||||
@$(SWIFTFORMAT) $(SOURCES)
|
||||
else
|
||||
@echo "$(COLOR_YELLOW)SwiftFormat not installed. Run: brew install swiftformat$(COLOR_NC)"
|
||||
endif
|
||||
endif
|
||||
|
||||
# Version generation (always runs before build)
|
||||
version:
|
||||
@./generate-version.sh
|
||||
|
||||
# Build (fallback)
|
||||
ifndef build
|
||||
build: version
|
||||
@echo "$(COLOR_GREEN)Building $(SWIFT_PACKAGE_NAME) (debug)...$(COLOR_NC)"
|
||||
@swift build -c debug
|
||||
endif
|
||||
|
||||
# Build release (fallback)
|
||||
ifndef build-release
|
||||
build-release: version
|
||||
@echo "$(COLOR_GREEN)Building $(SWIFT_PACKAGE_NAME) (release)...$(COLOR_NC)"
|
||||
@swift build -c release
|
||||
endif
|
||||
|
||||
# Clean (fallback)
|
||||
ifndef clean
|
||||
clean:
|
||||
@echo "$(COLOR_GREEN)Cleaning...$(COLOR_NC)"
|
||||
@swift package clean
|
||||
@rm -rf .build DerivedData
|
||||
endif
|
||||
|
||||
# Test (fallback)
|
||||
ifndef test
|
||||
test:
|
||||
@echo "$(COLOR_GREEN)Running tests...$(COLOR_NC)"
|
||||
@swift test
|
||||
endif
|
||||
|
||||
# Project-specific targets
|
||||
run: build
|
||||
@echo "$(COLOR_GREEN)Running $(SWIFT_PACKAGE_NAME)...$(COLOR_NC)"
|
||||
@.build/debug/$(SWIFT_PACKAGE_NAME)
|
||||
|
||||
install: build-release
|
||||
@echo "$(COLOR_GREEN)Installing via install.sh...$(COLOR_NC)"
|
||||
@./install.sh
|
||||
Loading…
Add table
Reference in a new issue