Merge branch 'master' into master

.github/workflows/deploy.yaml

@@ -13,15 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     name: Build & Deploy
     steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-      - run: npm install
+      - uses: actions/checkout@v4
       - name: Publish
-        uses: cloudflare/wrangler-action@2.0.0
+        uses: cloudflare/wrangler-action@v3
         with:
           apiToken: ${{ secrets.CF_API_TOKEN }}
-        env:
-          CF_ACCOUNT_ID: ${{secrets.CF_ACCOUNT_ID}}
+          accountId: ${{secrets.CF_ACCOUNT_ID}}
+          command: deploy --env production --minify src/index.js
+          environment: production

.github/workflows/stage.yaml

@@ -0,0 +1,23 @@
+name: Deploy to Cloudflare Workers(Staging)
+
+on:
+  pull_request:
+    branches:
+      - master
+    paths-ignore:
+      - '**.md'
+  repository_dispatch:
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    name: Build & Deploy
+    steps:
+      - uses: actions/checkout@v4
+      - name: Publish
+        uses: cloudflare/wrangler-action@v3
+        with:
+          apiToken: ${{ secrets.CF_API_TOKEN }}
+          accountId: ${{secrets.CF_ACCOUNT_ID}}
+          command: deploy --env staging --minify src/index.js
+          environment: staging

README.md

@@ -8,13 +8,13 @@
 
 ## Deploy
 
-1. fork this project
-2. modify the link of the above button to your fork url
-3. click the button, you will be redirected to the deploy page
+1. click the "Deploy With Workers" button
+2. follow the instructions to fork and deploy
+3. update routes as you requirement
 
 [![Deploy to Cloudflare Workers](https://deploy.workers.cloudflare.com/button)](https://deploy.workers.cloudflare.com/?url=https://github.com/liulinlin/docker-proxy)
 
-## Config tutorial
+## Routes configuration tutorial
 
 1. use cloudflare worker host: only support proxy one registry
    ```javascript

src/index.js

@@ -3,6 +3,8 @@ addEventListener("fetch", (event) => {
   event.respondWith(handleRequest(event.request));
 });
 
+const dockerHub = "https://registry-1.docker.io";
+
 const routes = {
   "docker.liulinlin.life": "https://registry-1.docker.io",
   "docker.liulinlin.uk": "https://registry-1.docker.io",
@@ -38,6 +40,7 @@ async function handleRequest(request) {
       }
     );
   }
+  const isDockerHub = upstream == dockerHub;
   const authorization = request.headers.get("Authorization");
   if (url.pathname == "/v2/") {
     const newUrl = new URL(upstream + "/v2/");
@@ -86,7 +89,28 @@ async function handleRequest(request) {
       return resp;
     }
     const wwwAuthenticate = parseAuthenticate(authenticateStr);
-    return await fetchToken(wwwAuthenticate, url.searchParams, authorization);
+    let scope = url.searchParams.get("scope");
+    // autocomplete repo part into scope for DockerHub library images
+    // Example: repository:busybox:pull => repository:library/busybox:pull
+    if (scope && isDockerHub) {
+      let scopeParts = scope.split(":");
+      if (scopeParts.length == 3 && !scopeParts[1].includes("/")) {
+        scopeParts[1] = "library/" + scopeParts[1];
+        scope = scopeParts.join(":");
+      }
+    }
+    return await fetchToken(wwwAuthenticate, scope, authorization);
+  }
+  // redirect for DockerHub library images
+  // Example: /v2/busybox/manifests/latest => /v2/library/busybox/manifests/latest
+  if (isDockerHub) {
+    const pathParts = url.pathname.split("/");
+    if (pathParts.length == 5) {
+      pathParts.splice(2, 0, "library");
+      const redirectUrl = new URL(url);
+      redirectUrl.pathname = pathParts.join("/");
+      return Response.redirect(redirectUrl, 301);
+    }
   }
   // foward requests
   const newUrl = new URL(upstream + url.pathname);
@@ -103,7 +127,7 @@ function parseAuthenticate(authenticateStr) {
   // match strings after =" and before "
   const re = /(?<=\=")(?:\\.|[^"\\])*(?=")/g;
   const matches = authenticateStr.match(re);
-  if (matches === null || matches.length < 2) {
+  if (matches == null || matches.length < 2) {
     throw new Error(`invalid Www-Authenticate Header: ${authenticateStr}`);
   }
   return {
@@ -112,13 +136,13 @@ function parseAuthenticate(authenticateStr) {
   };
 }
 
-async function fetchToken(wwwAuthenticate, searchParams, authorization) {
+async function fetchToken(wwwAuthenticate, scope, authorization) {
   const url = new URL(wwwAuthenticate.realm);
   if (wwwAuthenticate.service.length) {
     url.searchParams.set("service", wwwAuthenticate.service);
   }
-  if (searchParams.get("scope")) {
-    url.searchParams.set("scope", searchParams.get("scope"));
+  if (scope) {
+    url.searchParams.set("scope", scope);
   }
   headers = new Headers();
   if (authorization) {

wrangler.toml

@@ -1,18 +1,35 @@
 name = "cloudflare-docker-proxy"
-workers_dev = true
-main = "src/index.js"
-compatibility_date = "2021-12-07"
+compatibility_date = "2023-12-01"
 
 [dev]
 ip = "0.0.0.0"
 port = 8787
-local_protocol="http"
-upstream_protocol="https"
-
-[vars]
-MODE="production"
-TARGET_UPSTREAM=""
+local_protocol = "http"
 
 [env.dev.vars]
-MODE="debug"
-TARGET_UPSTREAM="https://registry-1.docker.io"
+MODE = "debug"
+TARGET_UPSTREAM = "https://registry-1.docker.io"
+
+[env.production]
+name = "cloudflare-docker-proxy"
+# routes = [
+#   { pattern = "docker.libcuda.so", custom_domain = true },
+#   { pattern = "quay.libcuda.so", custom_domain = true },
+#   { pattern = "gcr.libcuda.so", custom_domain = true },
+#   { pattern = "k8s-gcr.libcuda.so", custom_domain = true },
+#   { pattern = "k8s.libcuda.so", custom_domain = true },
+#   { pattern = "ghcr.libcuda.so", custom_domain = true },
+#   { pattern = "cloudsmith.libcuda.so", custom_domain = true },
+# ]
+
+[env.production.vars]
+MODE = "production"
+TARGET_UPSTREAM = ""
+
+[env.staging]
+name = "cloudflare-docker-proxy-staging"
+# route = { pattern = "docker-staging.libcuda.so", custom_domain = true }
+
+[env.staging.vars]
+MODE = "staging"
+TARGET_UPSTREAM = ""