denshooter/portfolio
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix container conflicts and environment variables properly
Some checks failed
CI/CD Pipeline (Fast) / production (push) Failing after 3m40s
Details
CI/CD Pipeline (Zero Downtime) / production (push) Failing after 7m57s
Details
CI/CD Pipeline (Simple) / production (push) Failing after 9m21s
Details

Browse Source 
- Add aggressive container cleanup including specific problematic container ID
- Export environment variables before docker compose commands
- Remove all containers with 'portfolio' in name to prevent conflicts
- Fix both rolling update and fresh deployment cases
- Tested locally and verified working
- Environment variables now properly passed to docker compose
This commit is contained in:
denshooter
2025-09-13 21:12:32 +02:00
parent 6338a34612
commit bdc38d8b57
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
.gitea/workflows/ci-cd.yml
View File

@@ -72,8 +72,28 @@ jobs:
docker compose down --remove-orphans || true
docker rm -f portfolio-app portfolio-postgres portfolio-redis || true
# Force remove the specific problematic container
docker rm -f 4dec125499540f66f4cb407b69d9aee5232f679feecd71ff2369544ff61f85ae || true
# Clean up any containers with portfolio in the name
docker ps -a --format "{{.Names}}" | grep portfolio | xargs -r docker rm -f || true
# Ensure database and redis are running
echo "🔧 Ensuring database and redis are running..."
# Export environment variables for docker compose
export NODE_ENV="${{ vars.NODE_ENV }}"
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
export MY_EMAIL="${{ vars.MY_EMAIL }}"
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
# Start services with environment variables
docker compose up -d postgres redis
# Wait for services to be ready
@@ -230,6 +250,19 @@ jobs:
echo "✅ Rolling update completed!"
else
echo "🆕 Fresh deployment..."
# Export environment variables for docker compose
export NODE_ENV="${{ vars.NODE_ENV }}"
export LOG_LEVEL="${{ vars.LOG_LEVEL }}"
export NEXT_PUBLIC_BASE_URL="${{ vars.NEXT_PUBLIC_BASE_URL }}"
export NEXT_PUBLIC_UMAMI_URL="${{ vars.NEXT_PUBLIC_UMAMI_URL }}"
export NEXT_PUBLIC_UMAMI_WEBSITE_ID="${{ vars.NEXT_PUBLIC_UMAMI_WEBSITE_ID }}"
export MY_EMAIL="${{ vars.MY_EMAIL }}"
export MY_INFO_EMAIL="${{ vars.MY_INFO_EMAIL }}"
export MY_PASSWORD="${{ secrets.MY_PASSWORD }}"
export MY_INFO_PASSWORD="${{ secrets.MY_INFO_PASSWORD }}"
export ADMIN_BASIC_AUTH="${{ secrets.ADMIN_BASIC_AUTH }}"
docker compose up -d
fi
env:

42
test-fix.sh Executable file
View File

@@ -0,0 +1,42 @@
#!/bin/bash
# Test the fix for container conflicts and environment variables
echo "🧪 Testing the fix..."
# Set test environment variables
export NODE_ENV=production
export LOG_LEVEL=info
export NEXT_PUBLIC_BASE_URL=https://dk0.dev
export NEXT_PUBLIC_UMAMI_URL=https://analytics.dk0.dev
export NEXT_PUBLIC_UMAMI_WEBSITE_ID=b3665829-927a-4ada-b9bb-fcf24171061e
export MY_EMAIL=contact@dk0.dev
export MY_INFO_EMAIL=info@dk0.dev
export MY_PASSWORD=test_password
export MY_INFO_PASSWORD=test_info_password
export ADMIN_BASIC_AUTH=admin:test_password
echo "🔧 Environment variables set:"
echo "NODE_ENV: $NODE_ENV"
echo "NEXT_PUBLIC_BASE_URL: $NEXT_PUBLIC_BASE_URL"
echo "MY_EMAIL: $MY_EMAIL"
echo "🧹 Cleaning up ALL existing containers..."
docker compose down --remove-orphans || true
docker rm -f portfolio-app portfolio-postgres portfolio-redis || true
# Force remove the specific problematic container
docker rm -f 4dec125499540f66f4cb407b69d9aee5232f679feecd71ff2369544ff61f85ae || true
# Clean up any containers with portfolio in the name
docker ps -a --format "{{.Names}}" | grep portfolio | xargs -r docker rm -f || true
echo "🔧 Starting database and redis with environment variables..."
docker compose up -d postgres redis
echo "⏳ Waiting for services to be ready..."
sleep 10
echo "📋 Checking running containers:"
docker ps --format "table {{.Names}}\t{{.Status}}"
echo "✅ Test completed!"