[lwpm] sync support oci

Signed-off-by: Kang Huaishuai <khs1994@khs1994.com>

Author: khs1994

dockerfile/php/.github/workflows/php_8_4.yml

@@ -113,6 +113,7 @@ jobs:
         if [ "$TYPE" = "ZTS" ];then
           echo ::group::Build $TYPE
           docker buildx build $options \
+          --secret id=github-token,env=GITHUB_TOKEN \
           --build-arg ALPINE_URL=${ALPINE_URL:-dl-cdn.alpinelinux.org} \
           -t $DOCKER_HUB_USERNAME/php:${PHP_TAG_VERSION}-frankenphp-alpine \
           $(for item in `echo $mirror`;do echo " -t ${item}:${PHP_TAG_VERSION}-frankenphp-alpine ";done) \

dockerfile/php/8.4/zts/Dockerfile

@@ -450,10 +450,11 @@ LABEL org.opencontainers.image.revision=$VCS_REF \
 
 ENV GODEBUG=cgocheck=0
 
-ARG FRANKENPHP_VERSION='v1.7.0'
+ARG FRANKENPHP_VERSION='v1.9.0'
 
 RUN --mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go,rw \
     --mount=type=cache,target=/root/go,rw \
+    --mount=type=secret,id=github-token \
   set -x \
   && apk add --no-cache \
 	# ca-certificates \
@@ -490,16 +491,20 @@ RUN --mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go,rw \
   && export GOTOOLCHAIN=local \
   && mkdir -p /usr/local/src/watcher \
   && cd /usr/local/src/watcher \
-  && curl -s https://api.github.com/repos/e-dant/watcher/releases/latest | \
-		grep tarball_url | \
-		awk '{ print $2 }' | \
-		sed 's/,$//' | \
-		sed 's/"//g' | \
-		xargs curl -L | \
-    tar xz --strip-components 1 && \
-    cmake -S . -B build -DCMAKE_BUILD_TYPE=Release && \
-	cmake --build build && \
-	cmake --install build \
+  && if [ -f /run/secrets/github-token ] && [ -s /run/secrets/github-token ]; then \
+        curl -s -H "Authorization: Bearer $(cat /run/secrets/github-token)" https://api.github.com/repos/e-dant/watcher/releases/latest; \
+    else \
+        curl -s https://api.github.com/repos/e-dant/watcher/releases/latest; \
+    fi | \
+  grep tarball_url | \
+  awk '{ print $2 }' | \
+  sed 's/,$//' | \
+  sed 's/"//g' | \
+  xargs curl -L | \
+  tar xz --strip-components 1 && \
+  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release && \
+  cmake --build build && \
+  cmake --install build \
   && cd /go/src/app \
   && go mod download \
   && cd /go/src/app/caddy \
@@ -509,7 +514,8 @@ RUN --mount=type=bind,from=go,source=/usr/local/go,target=/usr/local/go,rw \
   && export CGO_CPPFLAGS=$PHP_CPPFLAGS \
   && export CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS" \
   && cd /go/src/app/caddy/frankenphp \
-  && GOBIN=/usr/local/bin go install -tags 'nobadger,nomysql,nopgx' -ldflags "-w -s -extldflags '-Wl,-z,stack-size=0x80000' -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" -buildvcs=true && \
+  && GOBIN=/usr/local/bin \
+    ../../go.sh install -ldflags "-w -s -extldflags '-Wl,-z,stack-size=0x80000' -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" -buildvcs=true && \
 	setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
 	([ -z "${NO_COMPRESS}" ] && upx --best /usr/local/bin/frankenphp || true) && \
 	frankenphp version && \

windows/docker-image-sync.ps1

@@ -271,7 +271,7 @@ Function _sync($source, $dest, $config) {
 
     # try oci manifest list
     $manifest_list_json_path = Get-Manifest $token $source_image $source_ref -raw $false `
-    -registry $source_registry -header [OCIImageSpec]::manifest_list
+      -registry $source_registry -header $([OCIImageSpec]::manifest_list)
 
     if ($manifest_list_json_path) {
       $oci_manifest_list = $true

windows/sdk/dockerhub/manifests/get.psm1

@@ -5,7 +5,7 @@ Import-Module $PSScriptRoot/../cache/cache.psm1
 function Get-Manifest([string]$token, [string]$image, $ref, $header, $registry = "registry.hub.docker.com", $raw = $true, $return_digest_only = $false) {
   if (!$header) { $header = [DockerImageSpec]::manifest_list }
 
-  $type = "manifest"
+  $type = "docker manifest"
 
   if ($header -eq [DockerImageSpec]::manifest_list) { $type = "docker manifest list" }
   if ($header -eq [OCIImageSpec]::manifest_list) { $type = "oci manifest list" }