Merge branch 'master' into temp

.github/ISSUE_TEMPLATE/porter.md

@@ -11,7 +11,13 @@ assignees: ''
 
 **Issues 必须带 `porter` label，** 简单来说就是通过模板创建就没问题，别抖机灵自己瞎弄。
 
-**标题必须为 `[PORTER]镜像名:tag` 的格式，** 例如`[PORTER]k8s.gcr.io/federation-controller-manager-arm64:v1.3.1-beta.1`,`[PORTER]gcr.io/google-containers/federation-controller-manager-arm64:v1.3.1-beta.1`
+**标题必须为 `[PORTER]镜像名:tag` 的格式，** 例如
+- `[PORTER]k8s.gcr.io/federation-controller-manager-arm64:v1.3.1-beta.1`
+- `[PORTER]gcr.io/google-containers/federation-controller-manager-arm64:v1.3.1-beta.1`
+
+**特别的**，如果要指定平台的话 `[PORTER]镜像名:tag|平台类型`
+- `[PORTER]busybox:latest|linux/arm64`
+- `[PORTER]busybox:latest|linux/arm/v7`
 
 issues的内容无所谓，可以为空
 
@@ -19,4 +25,4 @@ issues的内容无所谓，可以为空
 
 **注意:**
 
-**>>>>>>>>本项目目前仅支持 gcr.io、k8s.gcr.io、registry.k8s.io、quay.io、ghcr.io 镜像<<<<<<<<**
+**>>>>>>>>本项目目前仅支持 gcr.io、k8s.gcr.io、docker.io、registry.k8s.io、quay.io、ghcr.io 镜像<<<<<<<<**

.github/workflows/gcr.io_mirror.yml

@@ -1,17 +1,17 @@
 name: gcr.io_mirror
 
 on:
+  schedule:
+    - cron: '0 16 * * *'
   issues:
     types: [opened, edited]
   label:
     types: [created]
   workflow_dispatch:
 
-
 jobs:
   build:
     runs-on: ubuntu-latest
-    if: contains(github.event.issue.labels.*.name, 'porter')
     steps:
       - name: 检出代码
         uses: actions/checkout@v3

README.md

@@ -1,6 +1,17 @@
 Google Container Registry Mirror(Google Container Registry镜像加速)
 -------
 
+Disclaimer/免责声明
+-------
+本人郑重承诺
+1. 本项目不以盈利为目的，过去，现在，未来都不会用于牟利。
+2. 本项目不承诺永久可用（比如包括但不限于 DockerHub 关闭，或者 DockerHub 修改免费计划限制个人免费镜像数量，Github 主动关闭本项目，Github Action 免费计划修改），但会承诺尽量做到向后兼容（也就是后续有新的扩展 Registry 不会改动原有规则导致之前的不可用）。
+3. 本项目不承诺所转存的镜像是安全可靠的，本项目只做转存（从上游 Registry pull 镜像，重新打tag，推送到目标 Registry（本项目是推到 Docker hub , 可以通过 Fork 到自己仓库改成私有 Registry）），不会进行修改（但是转存后的摘要和上游摘要不相同，这是正常的(因为镜像名字变了)），但是如果上游本身就是恶意镜像，那么转存后仍然是恶意镜像。目前支持的 `gcr.io` , `k8s.gcr.io` , `registry.k8s.io` , `quay.io`, `ghcr.io` 好像都是支持个人上传镜像的，在使用镜像前，请自行确认上游是否可靠，应自行避免供应链攻击。
+4. 对于 DockerHub 和 Github 某些策略修改导致的 不可预知且不可控因素等导致业务无法拉取镜像而造成损失的，本项目不承担责任。
+5. 对于上游恶意镜像或者上游镜像依赖库版本低导致的安全风险 本项目无法识别，删除，停用，过滤，要求使用者自行甄别，本项目不承担责任。
+
+如果不认可上面所述，请不要使用本项目，一旦使用，则视为同意。
+
 Syntax/语法
 -------
 
@@ -33,7 +44,13 @@ Uses/如何拉取新镜像
 
 **Issues 必须带 `porter` label，** 简单来说就是通过模板创建就没问题，别抖机灵自己瞎弄。
 
-**标题必须为 `[PORTER]镜像名:tag` 的格式，** 例如`[PORTER]k8s.gcr.io/federation-controller-manager-arm64:v1.3.1-beta.1`,`[PORTER]gcr.io/google-containers/federation-controller-manager-arm64:v1.3.1-beta.1`
+**标题必须为 `[PORTER]镜像名:tag` 的格式，** 例如
+- `[PORTER]k8s.gcr.io/federation-controller-manager-arm64:v1.3.1-beta.1`
+- `[PORTER]gcr.io/google-containers/federation-controller-manager-arm64:v1.3.1-beta.1`
+
+**特别的**，如果要指定平台的话 `[PORTER]镜像名:tag|平台类型`
+- `[PORTER]busybox:latest|linux/arm64`
+- `[PORTER]busybox:latest|linux/arm/v7`
 
 issues的内容无所谓，可以为空
 
@@ -49,7 +66,9 @@ Fork/分叉代码自行维护
 
 - 必须: <https://github.com/anjia0532/gcr.io_mirror/fork> 点击连接在自己账号下分叉出 `gcr.io_mirror` 项目
 - 可选: 修改 [./rules.yaml](./rules.yaml) 增加暂未支持的镜像库
+- 在 [./settings/actions](../../settings/actions) 的 `Workflow permissions` 选项中，授予读写权限
 - 在 [./settings/secrets/actions](../../settings/secrets/actions) 创建自己的参数
+- 随便新建个issues，然后在右侧创建个名为 `porter` 和 `question` 的 label，后续通过模板创建时会自动带上。 详见 https://github.com/anjia0532/gcr.io_mirror/issues/3893
 
 `DOCKER_REGISTRY`: 如果推到 docker hub 为空即可
 

go.mod

@@ -1,6 +1,6 @@
 module image-mirror
 
-go 1.18
+go 1.20
 
 require (
 	github.com/docker/docker v20.10.17+incompatible

go.sum

@@ -1,9 +1,15 @@
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc=
 github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE=
+github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68=
 github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE=
@@ -14,27 +20,99 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
 github.com/google/go-github/v47 v47.0.0 h1:eQap5bIRZibukP0VhngWgpuM0zhY4xntqOzn6DhdkE4=
 github.com/google/go-github/v47 v47.0.0/go.mod h1:DRjdvizXE876j0YOZwInB1ESpOcU/xFBClNiQLSdorE=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
+github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
 github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
 golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 h1:qWPm9rbaAMKs8Bq/9LRpbMqxWRVUAQwMI9fVrssnTfw=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 h1:ftMN5LMiBFjbzleLqtoBZk7KdJwhuybIU+FckUHgoyQ=
+golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
+gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo=
+gotest.tools/v3 v3.3.0/go.mod h1:Mcr9QNxkg0uMvy/YElmo4SpXgJKWgQvYrT7Kw5RzJ1A=

main.go

@@ -14,13 +14,40 @@ import (
 	"gopkg.in/alecthomas/kingpin.v2"
 	"gopkg.in/yaml.v3"
 	"io"
-	"io/ioutil"
 	"os"
 	"regexp"
 	"strings"
 	"text/template"
 )
 
+var resultTpl = `
+{{ if .Success }}
+**转换完成**
+^^^bash
+{{ if .Registry }}
+docker login -u{{ .RegistryUser }} {{ .Registry }}
+{{ end }}
+#原镜像
+{{ .OriginImageName }}
+
+#转换后镜像
+{{ .TargetImageName }}
+
+
+#下载并重命名镜像
+docker pull {{ .TargetImageName }} {{ if .Platform }} --platform {{ .Platform }} {{ end }}
+
+docker tag  {{ .TargetImageName }} {{ index (split .OriginImageName "@") 0 }}
+
+docker images | grep $(echo {{ .OriginImageName }} |awk -F':' '{print $1}')
+
+^^^
+{{ else }}
+**转换失败**
+详见 [构建任务](https://github.com/{{ .GhUser }}/{{ .Repo }}/actions/runs/{{ .RunId }})
+{{ end }}
+`
+
 func main() {
 	ctx := context.Background()
 
@@ -48,6 +75,7 @@ func main() {
 		RunId:             *runId,
 		Rules: map[string]string{
 			"^gcr.io":          "",
+			"^docker.io":       "docker",
 			"^k8s.gcr.io":      "google-containers",
 			"^registry.k8s.io": "google-containers",
 			"^quay.io":         "quay",
@@ -55,7 +83,7 @@ func main() {
 		},
 	}
 
-	rulesFile, err := ioutil.ReadFile("rules.yaml")
+	rulesFile, err := os.ReadFile("rules.yaml")
 	if err == nil {
 		rules := make(map[string]string)
 		err2 := yaml.Unmarshal(rulesFile, &rules)
@@ -86,7 +114,7 @@ func main() {
 
 	fmt.Println("添加 构建进展 Comment")
 	commentIssues(issue, cli, ctx, "[构建进展](https://github.com/"+config.GhUser+"/"+config.Repo+"/actions/runs/"+config.RunId+")")
-	err, originImageName, targetImageName := mirrorByIssues(issue, config)
+	err, originImageName, targetImageName, platform := mirrorByIssues(issue, config)
 	if err != nil {
 		commentErr := commentIssues(issue, cli, ctx, err.Error())
 		if commentErr != nil {
@@ -100,6 +128,7 @@ func main() {
 		RegistryUser    string
 		OriginImageName string
 		TargetImageName string
+		Platform        string
 		GhUser          string
 		Repo            string
 		RunId           string
@@ -109,13 +138,17 @@ func main() {
 		RegistryUser:    config.RegistryUserName,
 		OriginImageName: originImageName,
 		TargetImageName: targetImageName,
+		Platform:        platform,
 		GhUser:          *ghUser,
 		Repo:            *ghRepo,
 		RunId:           *runId,
 	}
 
 	var buf bytes.Buffer
-	tmpl, err := template.New("result").Parse(resultTpl)
+	funcmap := template.FuncMap{
+		"split": strings.Split,
+	}
+	tmpl, err := template.New("result").Funcs(funcmap).Parse(resultTpl)
 	err = tmpl.Execute(&buf, &result)
 
 	fmt.Println("添加 转换结果 Comment")
@@ -124,40 +157,16 @@ func main() {
 	commentIssues(issue, cli, ctx, strings.ReplaceAll(res, "^", "`"))
 
 	fmt.Println("添加 转换结果 Label")
-	issuesAddLabels(issue, cli, ctx, result.Success)
+	var labels []string
+	if len(platform) > 0 {
+		labels = append(labels, "platform")
+	}
+	issuesAddLabels(issue, cli, ctx, result.Success, labels)
 
 	fmt.Println("关闭 Issues")
 	issuesClose(issue, cli, ctx)
 }
 
-var resultTpl = `
-{{ if .Success }}
-**转换完成**
-^^^bash
-{{ if .Registry }}
-docker login -u{{ .RegistryUser }} {{ .Registry }}
-{{ end }}
-#原镜像
-{{ .OriginImageName }}
-
-#转换后镜像
-{{ .TargetImageName }}
-
-
-#下载并重命名镜像
-docker pull {{ .TargetImageName }}
-
-docker tag  {{ .TargetImageName }} {{ .OriginImageName }}
-
-docker images | grep $(echo {{ .OriginImageName }} |awk -F':' '{print $1}')
-
-^^^
-{{ else }}
-**转换失败**
-详见 [构建任务](https://github.com/{{ .GhUser }}/{{ .Repo }}/actions/runs/{{ .RunId }})
-{{ end }}
-`
-
 func issuesClose(issues *github.Issue, cli *github.Client, ctx context.Context) {
 	names := strings.Split(*issues.RepositoryURL, "/")
 	state := "closed"
@@ -165,14 +174,19 @@ func issuesClose(issues *github.Issue, cli *github.Client, ctx context.Context)
 		State: &state,
 	})
 }
-func issuesAddLabels(issues *github.Issue, cli *github.Client, ctx context.Context, success bool) {
+func issuesAddLabels(issues *github.Issue, cli *github.Client, ctx context.Context, success bool, labels []string) {
 	names := strings.Split(*issues.RepositoryURL, "/")
-
 	label := "success"
 	if !success {
 		label = "failed"
 	}
-	cli.Issues.AddLabelsToIssue(ctx, names[len(names)-2], names[len(names)-1], issues.GetNumber(), []string{label})
+	if labels == nil {
+		labels = []string{label}
+	} else {
+		labels = append(labels, label)
+	}
+
+	cli.Issues.AddLabelsToIssue(ctx, names[len(names)-2], names[len(names)-1], issues.GetNumber(), labels)
 }
 func commentIssues(issues *github.Issue, cli *github.Client, ctx context.Context, comment string) error {
 	names := strings.Split(*issues.RepositoryURL, "/")
@@ -182,23 +196,35 @@ func commentIssues(issues *github.Issue, cli *github.Client, ctx context.Context
 	return err
 }
 
-func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImageName string, targetImageName string) {
+func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImageName string, targetImageName string, platform string) {
 	// 去掉前缀 [PORTER] 整体去除前后空格
 	originImageName = strings.TrimSpace(strings.Replace(*issues.Title, "[PORTER]", "", 1))
+	names := strings.Split(originImageName, "|")
+
+	originImageName = names[0]
+	if len(names) > 1 {
+		platform = names[1]
+	}
+
+	if strings.Index(originImageName, ".") > strings.Index(originImageName, "/") {
+		originImageName = "docker.io/" + originImageName
+	}
+
 	targetImageName = originImageName
 
 	if strings.ContainsAny(originImageName, "@") {
-		return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像"), originImageName, targetImageName
+		targetImageName = strings.Split(originImageName, "@")[0]
 	}
 
 	registrys := []string{}
+
 	for k, v := range config.Rules {
 		targetImageName = regexp.MustCompile(k).ReplaceAllString(targetImageName, v)
 		registrys = append(registrys, k)
 	}
 
 	if strings.EqualFold(targetImageName, originImageName) {
-		return errors.New("@" + *issues.GetUser().Login + " 暂不支持同步" + originImageName + ",目前仅支持同步 `" + strings.Join(registrys, " ,") + "`镜像"), originImageName, targetImageName
+		return errors.New("@" + *issues.GetUser().Login + " 暂不支持同步" + originImageName + ",目前仅支持同步 `" + strings.Join(registrys, " ,") + "`镜像"), originImageName, targetImageName, platform
 	}
 
 	targetImageName = strings.ReplaceAll(targetImageName, "/", ".")
@@ -210,29 +236,33 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag
 		targetImageName = config.Registry + "/" + targetImageName
 	}
 	fmt.Println("source:", originImageName, " , target:", targetImageName)
+
+	//execCmd("docker", "login", config.Registry, "-u", config.RegistryUserName, "-p", config.RegistryPassword)
 	cli, ctx, err := dockerLogin(config)
 	if err != nil {
-		return errors.New("@" + config.GhUser + " ,docker login 报错 `" + err.Error() + "`"), originImageName, targetImageName
+		return errors.New("@" + config.GhUser + " ,docker login 报错 `" + err.Error() + "`"), originImageName, targetImageName, platform
 	}
-	//execCmd("docker", "login", config.Registry, "-u", config.RegistryUserName, "-p", config.RegistryPassword)
+
 	//execCmd("docker", "pull", originImageName)
-	err = dockerPull(originImageName, cli, ctx)
+	err = dockerPull(originImageName, platform, cli, ctx)
 
 	if err != nil {
-		return errors.New("@" + *issues.GetUser().Login + " ,docker pull 报错 `" + err.Error() + "`"), originImageName, targetImageName
+		return errors.New("@" + *issues.GetUser().Login + " ,docker pull 报错 `" + err.Error() + "`"), originImageName, targetImageName, platform
 	}
+
 	//execCmd("docker", "tag", originImageName, targetImageName)
 	err = dockerTag(originImageName, targetImageName, cli, ctx)
 	if err != nil {
-		return errors.New("@" + config.GhUser + " ,docker tag 报错 `" + err.Error() + "`"), originImageName, targetImageName
+		return errors.New("@" + *issues.GetUser().Login + " ,docker tag 报错 `" + err.Error() + "`"), originImageName, targetImageName, platform
-	}
-	//execCmd("docker", "push", targetImageName)
-	err = dockerPush(targetImageName, cli, ctx, config)
-	if err != nil {
-		return errors.New("@" + config.GhUser + " ,docker push 报错 `" + err.Error() + "`"), originImageName, targetImageName
 	}
 
-	return nil, originImageName, targetImageName
+	//execCmd("docker", "push", targetImageName)
+	err = dockerPush(targetImageName, platform, cli, ctx, config)
+	if err != nil {
+		return errors.New("@" + *issues.GetUser().Login + " ,docker push 报错 `" + err.Error() + "`"), originImageName, targetImageName, platform
+	}
+
+	return nil, originImageName, targetImageName, platform
 }
 
 func dockerLogin(config *Config) (*client.Client, context.Context, error) {
@@ -253,9 +283,11 @@ func dockerLogin(config *Config) (*client.Client, context.Context, error) {
 	}
 	return cli, ctx, nil
 }
-func dockerPull(originImageName string, cli *client.Client, ctx context.Context) error {
+func dockerPull(originImageName string, platform string, cli *client.Client, ctx context.Context) error {
 	fmt.Println("docker pull ", originImageName)
-	pullOut, err := cli.ImagePull(ctx, originImageName, types.ImagePullOptions{})
+	pullOut, err := cli.ImagePull(ctx, originImageName, types.ImagePullOptions{
+		Platform: platform,
+	})
 	if err != nil {
 		return err
 	}
@@ -268,7 +300,7 @@ func dockerTag(originImageName string, targetImageName string, cli *client.Clien
 	err := cli.ImageTag(ctx, originImageName, targetImageName)
 	return err
 }
-func dockerPush(targetImageName string, cli *client.Client, ctx context.Context, config *Config) error {
+func dockerPush(targetImageName string, platform string, cli *client.Client, ctx context.Context, config *Config) error {
 	fmt.Println("docker push ", targetImageName)
 	authConfig := types.AuthConfig{
 		Username: config.RegistryUserName,
@@ -285,6 +317,7 @@ func dockerPush(targetImageName string, cli *client.Client, ctx context.Context,
 
 	pushOut, err := cli.ImagePush(ctx, targetImageName, types.ImagePushOptions{
 		RegistryAuth: authStr,
+		Platform:     platform,
 	})
 	if err != nil {
 		return err

rules.yaml

@@ -1,5 +1,6 @@
-"^gcr.io/":          "gcr-io/"
+"^gcr.io/":          ""
-"^k8s.gcr.io/":      "google-containers/"
+"^k8s.gcr.io":       "google-containers"
-"^registry.k8s.io/": "google-containers/"
+"^registry.k8s.io":  "google-containers"
-"^quay.io/":         "quay/"
+"^quay.io":          "quay"
-"^ghcr.io/":         "ghcr/"
+"^ghcr.io":          "ghcr"
+"^docker.io":        "docker"