diff --git a/.gitea/workflows/ci-dev.yml b/.gitea/workflows/ci-dev.yml index 2d13d04..4c5cab3 100644 --- a/.gitea/workflows/ci-dev.yml +++ b/.gitea/workflows/ci-dev.yml @@ -1,4 +1,4 @@ -name: Docker Build & Deploy (DEV) +name: Local Docker Build (Dev) on: push: @@ -135,42 +135,9 @@ jobs: echo "❌ DEV local registry login failed - continuing to Docker Hub" fi - - name: Push DEV to Docker Hub - if: github.ref == 'refs/heads/dev' - run: | - echo "=== Pushing DEV image to Docker Hub ===" - - # Use temporary config directory to avoid permission issues - export DOCKER_CONFIG=/tmp/docker-config-dev-hub - mkdir -p $DOCKER_CONFIG - - if echo "${{ secrets.DOCKER_HUB_TOKEN }}" | docker --config $DOCKER_CONFIG login -u "${{ secrets.DOCKER_HUB_USERNAME }}" --password-stdin; then - echo "✅ Docker Hub login successful" - - DOCKER_HUB_REPO="sbcrumb/nfoguard" - - # Tag and push dev image - docker tag nfoguard:dev "$DOCKER_HUB_REPO:dev" - docker tag nfoguard:dev "$DOCKER_HUB_REPO:dev-${{ github.sha }}" - - echo "=== Pushing DEV tags to Docker Hub ===" - if timeout 300 docker --config $DOCKER_CONFIG push "$DOCKER_HUB_REPO:dev"; then - echo "✅ DEV tag pushed to Docker Hub" - - if timeout 180 docker --config $DOCKER_CONFIG push "$DOCKER_HUB_REPO:dev-${{ github.sha }}"; then - echo "✅ DEV SHA tag pushed to Docker Hub" - else - echo "⚠️ DEV SHA tag push failed" - fi - else - echo "❌ Failed to push DEV to Docker Hub" - exit 1 - fi - - echo "" - echo "🎉 DEV image available on Docker Hub!" - echo "📦 DEV image: sbcrumb/nfoguard:dev" - else - echo "❌ Docker Hub login failed for DEV push" - exit 1 - fi \ No newline at end of file + echo "" + echo "🎉 DEV build completed successfully!" + echo "" + echo "📦 Available DEV images:" + echo " Local only: nfoguard:dev" + echo " Local SHA: nfoguard:dev-${{ github.sha }}" \ No newline at end of file diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 410ccd8..3c375da 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Docker Build & Deploy +name: Local Docker Build (Main) on: push: @@ -177,61 +177,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 diff --git a/.gitignore b/.gitignore index ff21fc2..019c6a2 100644 --- a/.gitignore +++ b/.gitignore @@ -62,10 +62,14 @@ temp/ # Local development files (not for public repo) *.local CODE_STRUCTURE.local +sync-to-github.sh # Ignore GitHub workflows when pushing to Gitea .github/ +# Ignore Gitea workflows when pushing to GitHub +.gitea/ + # Temporary troubleshooting files - to be removed Dockerfile.optimized fix-gitea-packages.md