fix: update tv .nfo handling
updated TV .nfo handling
This commit is contained in:
+11
-56
@@ -1,8 +1,8 @@
|
||||
name: Docker Build & Deploy
|
||||
name: Local Docker Build (Main)
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ main, dev ]
|
||||
branches: [ main ]
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
|
||||
@@ -15,12 +15,13 @@ jobs:
|
||||
run: |
|
||||
echo "Current workspace: $(pwd)"
|
||||
|
||||
# Clean workspace first
|
||||
# Clean workspace and temp directory first
|
||||
rm -rf * .git* 2>/dev/null || true
|
||||
rm -rf /tmp/repo 2>/dev/null || true
|
||||
|
||||
# Clone the repository since Gitea runner doesn't auto-checkout
|
||||
echo "Cloning repository..."
|
||||
git clone http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/jskala/NFOguard.git /tmp/repo
|
||||
git clone --branch main http://${{ secrets.username }}:${{ secrets.token }}@192.168.253.221:3000/jskala/NFOguard.git /tmp/repo
|
||||
cp -r /tmp/repo/* .
|
||||
cp -r /tmp/repo/.* . 2>/dev/null || true
|
||||
rm -rf /tmp/repo
|
||||
@@ -98,6 +99,8 @@ jobs:
|
||||
echo "Building with layer caching..."
|
||||
docker build \
|
||||
$CACHE_ARGS \
|
||||
--build-arg GIT_BRANCH=main \
|
||||
--build-arg BUILD_SOURCE=gitea \
|
||||
--tag nfoguard:latest \
|
||||
--tag nfoguard:${{ github.sha }} \
|
||||
--tag "$CACHE_IMAGE" \
|
||||
@@ -177,61 +180,13 @@ jobs:
|
||||
|
||||
echo "🎉 Local registry step completed!"
|
||||
|
||||
- name: Login and Push to Docker Hub
|
||||
run: |
|
||||
echo "=== Pushing to Docker Hub ==="
|
||||
|
||||
# Use temporary config directory to avoid permission issues
|
||||
export DOCKER_CONFIG=/tmp/docker-config-hub
|
||||
mkdir -p $DOCKER_CONFIG
|
||||
|
||||
# Login to Docker Hub
|
||||
if echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker --config $DOCKER_CONFIG login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin; then
|
||||
echo "✅ Docker Hub login successful"
|
||||
|
||||
# Tag images for Docker Hub
|
||||
DOCKER_HUB_REPO="sbcrumb/nfoguard"
|
||||
docker tag nfoguard:latest "$DOCKER_HUB_REPO:latest"
|
||||
docker tag nfoguard:latest "$DOCKER_HUB_REPO:${{ github.sha }}"
|
||||
docker tag nfoguard:latest "$DOCKER_HUB_REPO:v$(cat VERSION)"
|
||||
|
||||
echo "Images tagged for Docker Hub: $DOCKER_HUB_REPO"
|
||||
|
||||
# Push to Docker Hub
|
||||
echo "=== Pushing latest tag to Docker Hub ==="
|
||||
if timeout 300 docker --config $DOCKER_CONFIG push "$DOCKER_HUB_REPO:latest"; then
|
||||
echo "✅ Latest tag pushed to Docker Hub"
|
||||
|
||||
echo "=== Pushing version tag to Docker Hub ==="
|
||||
if timeout 180 docker --config $DOCKER_CONFIG push "$DOCKER_HUB_REPO:v$(cat VERSION)"; then
|
||||
echo "✅ Version tag pushed to Docker Hub"
|
||||
else
|
||||
echo "⚠️ Version tag push failed"
|
||||
fi
|
||||
|
||||
echo "=== Pushing SHA tag to Docker Hub ==="
|
||||
if timeout 180 docker --config $DOCKER_CONFIG push "$DOCKER_HUB_REPO:${{ github.sha }}"; then
|
||||
echo "✅ SHA tag pushed to Docker Hub"
|
||||
else
|
||||
echo "⚠️ SHA tag push failed"
|
||||
fi
|
||||
|
||||
else
|
||||
echo "❌ Failed to push to Docker Hub"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
else
|
||||
echo "❌ Docker Hub login failed"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo ""
|
||||
echo "🎉 Successfully pushed to both registries!"
|
||||
echo "🎉 Local build completed successfully!"
|
||||
echo ""
|
||||
echo "📦 Available images:"
|
||||
echo " Local Gitea: 192.168.253.221:3000/jskala/nfoguard:latest"
|
||||
echo " Docker Hub: sbcrumb/nfoguard:latest"
|
||||
echo " Local Docker: nfoguard:latest"
|
||||
echo " Local SHA: nfoguard:${{ github.sha }}"
|
||||
echo " Local Gitea: 192.168.253.221:3000/jskala/nfoguard:latest"
|
||||
|
||||
deploy:
|
||||
needs: build
|
||||
|
||||
Reference in New Issue
Block a user