diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 67168bd..69ba812 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -14,21 +14,10 @@ jobs: matrix: runner: [linux-amd64, linux-arm64] runs-on: ${{ matrix.runner }} - - permissions: - contents: read - packages: write - - container: - image: docker:latest steps: - name: Checkout Code - run: | - apk add --no-cache git - git config --global init.defaultObjectFormat sha256 - git clone https://${{ github.token }}@git.chillcog.com/${{ github.repository }}.git . - git checkout ${{ github.sha }} + uses: actions/checkout@v4 - name: Log in to DHI Registry run: | @@ -36,46 +25,34 @@ jobs: - name: Log in to Gitea Container Registry run: | - echo "${{ secrets.GITHUB_TOKEN }}" | docker login git.chillcog.com -u "${{ github.repository_owner }}" --password-stdin + echo "${{ secrets.GITEA_REGISTRY_TOKEN }}" | docker login git.chillcog.com -u "${{ github.repository_owner }}" --password-stdin - name: Detect and Build Images env: REPO_OWNER: ${{ github.repository_owner }} EVENT_NAME: ${{ github.event_name }} run: | - apk add --no-cache bash findutils - - FILES_TO_BUILD="" REGISTRY_HOST="git.chillcog.com" - IF_OWNER="${REPO_OWNER:-chillcog}" OWNER_LOWER=$(echo "$IF_OWNER" | tr '[:upper:]' '[:lower:]') - if [ "$EVENT_NAME" = "schedule" ] || [ "$EVENT_NAME" = "workflow_dispatch" ]; then - echo "Scheduled or manual run triggered. Processing all YAML files..." - FILES_TO_BUILD=$(find . -maxdepth 1 -name "*.yml" -o -name "*.yaml") - else - echo "Push triggered. Detecting changed files..." - FILES_TO_BUILD=$(find . -maxdepth 1 -name "*.yml" -o -name "*.yaml") - fi - + FILES_TO_BUILD=$(find . -maxdepth 1 \( -name "*.yml" -o -name "*.yaml" \)) + for file in $FILES_TO_BUILD; do file=$(echo "$file" | sed 's|^\./||') - if [ ! -f "$file" ]; then continue; fi - if [[ "$file" == .gitea/* ]]; then continue; fi - filename=$(basename -- "$file") + [ -f "$file" ] || continue + + filename=$(basename -- "$file") image_base="${filename%.*}" image_name=$(echo "$image_base" | tr '[:upper:]' '[:lower:]') + TARGET_TAG="${REGISTRY_HOST}/${OWNER_LOWER}/${image_name}:latest" + echo "---------------------------------------------------" - echo "Processing: $file -> Target: ${REGISTRY_HOST}/${OWNER_LOWER}/${image_name}:latest" + echo "Processing: $file -> Target: $TARGET_TAG" echo "---------------------------------------------------" - docker build \ - -f "$file" \ - -t "${REGISTRY_HOST}/${OWNER_LOWER}/${image_name}:latest" \ - . - - docker push "${REGISTRY_HOST}/${OWNER_LOWER}/${image_name}:latest" + docker build -f "$file" -t "$TARGET_TAG" . + docker push "$TARGET_TAG" done \ No newline at end of file