diff --git a/.gitea/workflows/image-update-and-release.yaml b/.gitea/workflows/image-update-and-release.yaml index 19cfa11..e8cc90b 100644 --- a/.gitea/workflows/image-update-and-release.yaml +++ b/.gitea/workflows/image-update-and-release.yaml @@ -48,26 +48,26 @@ jobs: echo "Checking PHP versions..." CURRENT=$(grep -A3 "php:" values.yaml | grep "tag:" | head -1 | sed 's/.*tag: *"\([^"]*\)".*/\1/' | tr -d ' ') echo "Current PHP: $CURRENT" - + # Docker Hub API v2を使用してタグを取得 - # パターン: 8.4.12-fpm-alpine3.22 形式 + # パターン: 8.5.2-fpm-alpine3.23 形式(alpineバージョンは2-3桁に対応) LATEST=$(curl -s "https://registry.hub.docker.com/v2/repositories/library/php/tags?page_size=100" | \ jq -r '.results[].name' | \ - grep -E '^[0-9]+\.[0-9]+\.[0-9]+-fpm-alpine[0-9]+\.[0-9]+$' | \ + grep -E '^[0-9]+\.[0-9]+\.[0-9]+-fpm-alpine[0-9]+\.[0-9]{2,3}$' | \ sort -V | tail -1) - + if [ -z "$LATEST" ]; then echo "Warning: Could not fetch latest PHP version, using current" LATEST="$CURRENT" fi - - # PHPバージョンを抽出 (8.4.12の部分) + + # PHPバージョンを抽出 (8.5.2の部分) APP_VERSION=$(echo "$LATEST" | grep -oE '^[0-9]+\.[0-9]+\.[0-9]+') if [ -z "$APP_VERSION" ]; then - echo "Error: Could not extract PHP version" + echo "Error: Could not extract PHP version from: $LATEST" exit 1 fi - + echo "Latest PHP: $LATEST" echo "PHP version: $APP_VERSION" echo "current=$CURRENT" >> $GITHUB_OUTPUT