From f969c9ca04484f6eafa7ea55f3d98032fc7bc836 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 7 Nov 2022 09:57:32 +0800 Subject: [PATCH 01/18] Update README.md --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 1347d48..fa29d14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,17 @@ Google Container Registry Mirror(Google Container Registry镜像加速) ------- +Disclaimer/免责声明 +------- +本人郑重承诺 +1. 本项目不以盈利为目的，过去，现在，未来都不会用于牟利。 +2. 本项目不能承诺永久可用（比如包括但不限于 DockerHub 关闭，或者 DockerHub 修改免费计划限制个人免费镜像数量），但会承诺尽量做到向后兼容（也就是后续有新的扩展 Registry 不会改动原有规则导致之前的不可用）。 +3. 本项目不承诺所转存的镜像是安全可靠的，本项目只做转存（从上游 Registry pull 镜像，重新打tag，推送到目标 Registry（本项目是推到 Docker hub , 可以通过 Fork 到自己仓库改成私有 Registry）），不会进行修改（但是转存后的摘要和上游摘要不相同，这是正常的(因为镜像名字变了)），但是如果上游本身就是恶意镜像，那么转存后仍然是恶意镜像。目前支持的 `gcr.io` , `k8s.gcr.io` , `registry.k8s.io` , `quay.io`, `ghcr.io` 好像都是支持个人上传镜像的，在使用镜像前，请自行确认上游是否可靠，应自行避免供应链攻击。 +4. 对于 DockerHub 关闭、 DockerHub 被墙、DockerHub 修改免费计划限制个人镜像数量不可预知且不可控因素等导致业务无法拉取镜像而造成损失的，本项目不承担责任。 +5. 对于上游恶意镜像或者上游镜像依赖库版本低导致的安全风险 本项目无法识别，删除，停用，过滤，要求使用者自行甄别，本项目不承担责任。 + +如果不认可上面所述，请不要使用本项目，一旦使用，则视为同意。 + Syntax/语法 ------- From 7c0e65fb4e5cab14c2739a2d0fb33692d3a7fb74 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 7 Nov 2022 10:00:06 +0800 Subject: [PATCH 02/18] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa29d14..0473272 100644 --- a/README.md +++ b/README.md @@ -5,9 +5,9 @@ Disclaimer/免责声明 ------- 本人郑重承诺 1. 本项目不以盈利为目的，过去，现在，未来都不会用于牟利。 -2. 本项目不能承诺永久可用（比如包括但不限于 DockerHub 关闭，或者 DockerHub 修改免费计划限制个人免费镜像数量），但会承诺尽量做到向后兼容（也就是后续有新的扩展 Registry 不会改动原有规则导致之前的不可用）。 +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 关闭、 DockerHub 被墙、DockerHub 修改免费计划限制个人镜像数量不可预知且不可控因素等导致业务无法拉取镜像而造成损失的，本项目不承担责任。 +4. 对于 DockerHub 和 Github 某些策略修改导致的 不可预知且不可控因素等导致业务无法拉取镜像而造成损失的，本项目不承担责任。 5. 对于上游恶意镜像或者上游镜像依赖库版本低导致的安全风险 本项目无法识别，删除，停用，过滤，要求使用者自行甄别，本项目不承担责任。 如果不认可上面所述，请不要使用本项目，一旦使用，则视为同意。 From edbcf566d01f57416b39421b21944662bdee0a34 Mon Sep 17 00:00:00 2001 From: AnJia Date: Wed, 4 Jan 2023 18:45:12 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9issues=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main.go b/main.go index 1f993cd..561a855 100644 --- a/main.go +++ b/main.go @@ -210,26 +210,30 @@ 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 } - //execCmd("docker", "login", config.Registry, "-u", config.RegistryUserName, "-p", config.RegistryPassword) + //execCmd("docker", "pull", originImageName) err = dockerPull(originImageName, cli, ctx) if err != nil { return errors.New("@" + *issues.GetUser().Login + " ,docker pull 报错 `" + err.Error() + "`"), originImageName, targetImageName } + //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 } + //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 errors.New("@" + *issues.GetUser().Login + " ,docker push 报错 `" + err.Error() + "`"), originImageName, targetImageName } return nil, originImageName, targetImageName From 014742fde59aab92ae995fa613011422b837ea6c Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 24 Apr 2023 16:23:42 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 1 + rules.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index 561a855..a3e92f2 100644 --- a/main.go +++ b/main.go @@ -48,6 +48,7 @@ func main() { RunId: *runId, Rules: map[string]string{ "^gcr.io": "", + "^docker.io": "", "^k8s.gcr.io": "google-containers", "^registry.k8s.io": "google-containers", "^quay.io": "quay", diff --git a/rules.yaml b/rules.yaml index 55b5078..8c720ab 100644 --- a/rules.yaml +++ b/rules.yaml @@ -1,5 +1,6 @@ -"^gcr.io/": "" +"^gcr.io/": "" "^k8s.gcr.io": "google-containers" "^registry.k8s.io": "google-containers" "^quay.io": "quay" -"^ghcr.io": "ghcr" \ No newline at end of file +"^ghcr.io": "ghcr" +"^docker.io": "" \ No newline at end of file From 7827947e9e9a0dfa103fb8885f3a13461e389ef2 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 24 Apr 2023 16:31:50 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rules.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.yaml b/rules.yaml index 8c720ab..e248a99 100644 --- a/rules.yaml +++ b/rules.yaml @@ -3,4 +3,4 @@ "^registry.k8s.io": "google-containers" "^quay.io": "quay" "^ghcr.io": "ghcr" -"^docker.io": "" \ No newline at end of file +"^docker.io/": "" \ No newline at end of file From 2b6ab64aa18d0a6310e9d6dc068068c9425f2285 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 24 Apr 2023 16:41:28 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 +- rules.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main.go b/main.go index a3e92f2..5b0a39a 100644 --- a/main.go +++ b/main.go @@ -48,7 +48,7 @@ func main() { RunId: *runId, Rules: map[string]string{ "^gcr.io": "", - "^docker.io": "", + "^docker.io": "docker", "^k8s.gcr.io": "google-containers", "^registry.k8s.io": "google-containers", "^quay.io": "quay", diff --git a/rules.yaml b/rules.yaml index e248a99..d1d6812 100644 --- a/rules.yaml +++ b/rules.yaml @@ -3,4 +3,4 @@ "^registry.k8s.io": "google-containers" "^quay.io": "quay" "^ghcr.io": "ghcr" -"^docker.io/": "" \ No newline at end of file +"^docker.io/": "docker" \ No newline at end of file From 1210337d9f4717ad25b1c47463bdbe6599fdb030 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 24 Apr 2023 16:43:23 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/porter.md | 2 +- rules.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/porter.md b/.github/ISSUE_TEMPLATE/porter.md index 95994ed..9094957 100644 --- a/.github/ISSUE_TEMPLATE/porter.md +++ b/.github/ISSUE_TEMPLATE/porter.md @@ -19,4 +19,4 @@ issues的内容无所谓，可以为空 **注意:** -**>>>>>>>>本项目目前仅支持 gcr.io、k8s.gcr.io、registry.k8s.io、quay.io、ghcr.io 镜像<<<<<<<<** \ No newline at end of file +**>>>>>>>>本项目目前仅支持 gcr.io、k8s.gcr.io、docker.io、registry.k8s.io、quay.io、ghcr.io 镜像<<<<<<<<** \ No newline at end of file diff --git a/rules.yaml b/rules.yaml index d1d6812..d69ec62 100644 --- a/rules.yaml +++ b/rules.yaml @@ -1,6 +1,6 @@ -"^gcr.io/": "" -"^k8s.gcr.io": "google-containers" -"^registry.k8s.io": "google-containers" -"^quay.io": "quay" -"^ghcr.io": "ghcr" +"^gcr.io/": "" +"^k8s.gcr.io": "google-containers" +"^registry.k8s.io": "google-containers" +"^quay.io": "quay" +"^ghcr.io": "ghcr" "^docker.io/": "docker" \ No newline at end of file From cc980d04b30afe39aedce0da41566841b2e20ebc Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 24 Apr 2023 16:47:11 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E5=A2=9E=E5=8A=A0docker.io?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rules.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules.yaml b/rules.yaml index d69ec62..39b5383 100644 --- a/rules.yaml +++ b/rules.yaml @@ -3,4 +3,4 @@ "^registry.k8s.io": "google-containers" "^quay.io": "quay" "^ghcr.io": "ghcr" -"^docker.io/": "docker" \ No newline at end of file +"^docker.io": "docker" \ No newline at end of file From cebffad97cc941b5a0e55ba069ab56be8c0f43ac Mon Sep 17 00:00:00 2001 From: AnJia Date: Wed, 26 Jul 2023 10:08:34 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E6=AF=8F=E5=A4=A9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BD=AC=E5=AD=98=E6=BC=8F=E6=8E=89=E7=9A=84issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gcr.io_mirror.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gcr.io_mirror.yml b/.github/workflows/gcr.io_mirror.yml index 70bce96..77056b0 100644 --- a/.github/workflows/gcr.io_mirror.yml +++ b/.github/workflows/gcr.io_mirror.yml @@ -6,12 +6,12 @@ on: label: types: [created] workflow_dispatch: - + Schedule: + -cron: '0 16 * * *' jobs: build: runs-on: ubuntu-latest - if: contains(github.event.issue.labels.*.name, 'porter') steps: - name: 检出代码 uses: actions/checkout@v3 From ea7e7a5632d86c622912b35aa01f9b27d52b28e4 Mon Sep 17 00:00:00 2001 From: AnJia Date: Thu, 27 Jul 2023 10:29:54 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E6=AF=8F=E5=A4=A9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E8=BD=AC=E5=AD=98=E6=BC=8F=E6=8E=89=E7=9A=84issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gcr.io_mirror.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gcr.io_mirror.yml b/.github/workflows/gcr.io_mirror.yml index 77056b0..4823e58 100644 --- a/.github/workflows/gcr.io_mirror.yml +++ b/.github/workflows/gcr.io_mirror.yml @@ -1,13 +1,13 @@ name: gcr.io_mirror -on: +on: + schedule: + - cron: '0 16 * * *' issues: types: [opened, edited] label: types: [created] workflow_dispatch: - Schedule: - -cron: '0 16 * * *' jobs: build: From 707f87227657e8647b5cc4afcddf53cb2a8345ef Mon Sep 17 00:00:00 2001 From: Melody Young <57277705+keepwow@users.noreply.github.com> Date: Fri, 8 Sep 2023 18:30:49 +0800 Subject: [PATCH 11/18] Update README.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GITHUB_TOKEN 需要关闭 Issues 的权限 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0473272..1f95d9c 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,7 @@ Fork/分叉代码自行维护 - 必须: 点击连接在自己账号下分叉出 `gcr.io_mirror` 项目 - 可选: 修改 [./rules.yaml](./rules.yaml) 增加暂未支持的镜像库 +- 在 [./settings/actions](../../settings/actions) 的 `Workflow permissions` 选项中，授予读写权限 - 在 [./settings/secrets/actions](../../settings/secrets/actions) 创建自己的参数 `DOCKER_REGISTRY`: 如果推到 docker hub 为空即可 From bcb74bf485411910d917c14d002e14db9222a0ff Mon Sep 17 00:00:00 2001 From: AnJia Date: Fri, 19 Jan 2024 14:52:19 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E6=94=AF=E6=8C=81platform?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE/porter.md | 8 +++- README.md | 8 +++- go.mod | 2 +- go.sum | 78 ++++++++++++++++++++++++++++++++ main.go | 61 ++++++++++++++++--------- 5 files changed, 133 insertions(+), 24 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/porter.md b/.github/ISSUE_TEMPLATE/porter.md index 9094957..006794e 100644 --- a/.github/ISSUE_TEMPLATE/porter.md +++ b/.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的内容无所谓，可以为空 diff --git a/README.md b/README.md index 0473272..db93bf6 100644 --- a/README.md +++ b/README.md @@ -44,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的内容无所谓，可以为空 diff --git a/go.mod b/go.mod index 4b9b588..ade05ab 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module image-mirror -go 1.18 +go 1.20 require ( github.com/docker/docker v20.10.17+incompatible diff --git a/go.sum b/go.sum index 235b9e4..2bdffe1 100644 --- a/go.sum +++ b/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= diff --git a/main.go b/main.go index 5b0a39a..a76d042 100644 --- a/main.go +++ b/main.go @@ -14,7 +14,6 @@ import ( "gopkg.in/alecthomas/kingpin.v2" "gopkg.in/yaml.v3" "io" - "io/ioutil" "os" "regexp" "strings" @@ -56,7 +55,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) @@ -87,7 +86,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 { @@ -101,6 +100,7 @@ func main() { RegistryUser string OriginImageName string TargetImageName string + Platform string GhUser string Repo string RunId string @@ -110,6 +110,7 @@ func main() { RegistryUser: config.RegistryUserName, OriginImageName: originImageName, TargetImageName: targetImageName, + Platform: platform, GhUser: *ghUser, Repo: *ghRepo, RunId: *runId, @@ -125,7 +126,11 @@ 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) @@ -146,7 +151,7 @@ docker login -u{{ .RegistryUser }} {{ .Registry }} #下载并重命名镜像 -docker pull {{ .TargetImageName }} +docker pull {{ .TargetImageName }} {{ if .Platform }} --platform {{ .Platform }} {{ end }} docker tag {{ .TargetImageName }} {{ .OriginImageName }} @@ -166,14 +171,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, "/") @@ -183,13 +193,19 @@ 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] + } targetImageName = originImageName if strings.ContainsAny(originImageName, "@") { - return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像"), originImageName, targetImageName + return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像"), originImageName, targetImageName, platform } registrys := []string{} @@ -199,7 +215,7 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag } 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, "/", ".") @@ -215,29 +231,29 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag //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", "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("@" + *issues.GetUser().Login + " ,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) + err = dockerPush(targetImageName, platform, cli, ctx, config) if err != nil { - return errors.New("@" + *issues.GetUser().Login + " ,docker push 报错 `" + err.Error() + "`"), originImageName, targetImageName + return errors.New("@" + *issues.GetUser().Login + " ,docker push 报错 `" + err.Error() + "`"), originImageName, targetImageName, platform } - return nil, originImageName, targetImageName + return nil, originImageName, targetImageName, platform } func dockerLogin(config *Config) (*client.Client, context.Context, error) { @@ -258,9 +274,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 } @@ -273,7 +291,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, @@ -290,6 +308,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 From 097ca08bb9e105ba167ecb176349e50cd2c3019c Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 11 Mar 2024 12:09:08 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=BA=E7=9C=81docke?= =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main.go b/main.go index a76d042..716f5d0 100644 --- a/main.go +++ b/main.go @@ -205,10 +205,15 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag targetImageName = originImageName if strings.ContainsAny(originImageName, "@") { - return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像"), originImageName, targetImageName, platform + return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像,参见 [can't tag a image with digest: refusing to create a tag with a digest reference](https://github.com/docker/cli/issues/4545)"), originImageName, targetImageName, platform } registrys := []string{} + + if strings.Index(originImageName, ".") < 0 { + originImageName = "docker.io/" + originImageName + } + for k, v := range config.Rules { targetImageName = regexp.MustCompile(k).ReplaceAllString(targetImageName, v) registrys = append(registrys, k) From 568896b5a6cbf07ad445d845dfa3a3f16d840679 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 11 Mar 2024 12:18:04 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=BA=E7=9C=81docke?= =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/main.go b/main.go index 716f5d0..57f64ea 100644 --- a/main.go +++ b/main.go @@ -202,6 +202,11 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag if len(names) > 1 { platform = names[1] } + + if strings.Index(originImageName, ".") < 0 { + originImageName = "docker.io/" + originImageName + } + targetImageName = originImageName if strings.ContainsAny(originImageName, "@") { @@ -210,10 +215,6 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag registrys := []string{} - if strings.Index(originImageName, ".") < 0 { - originImageName = "docker.io/" + originImageName - } - for k, v := range config.Rules { targetImageName = regexp.MustCompile(k).ReplaceAllString(targetImageName, v) registrys = append(registrys, k) From 5f5c1b74a3427c5afdee3c48472a38a3092d9280 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 11 Mar 2024 13:48:07 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=BA=E7=9C=81docke?= =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 63 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/main.go b/main.go index 57f64ea..67b8fbd 100644 --- a/main.go +++ b/main.go @@ -20,6 +20,34 @@ import ( "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 }} {{ (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() @@ -117,7 +145,10 @@ func main() { } 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") @@ -136,34 +167,6 @@ func main() { issuesClose(issue, cli, ctx) } -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 }} {{ .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" @@ -210,7 +213,7 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag targetImageName = originImageName if strings.ContainsAny(originImageName, "@") { - return errors.New("@" + *issues.GetUser().Login + " 不支持同步带摘要信息的镜像,参见 [can't tag a image with digest: refusing to create a tag with a digest reference](https://github.com/docker/cli/issues/4545)"), originImageName, targetImageName, platform + targetImageName = strings.Split(originImageName, "@")[0] } registrys := []string{} From 05b8b350794045d207d40f8edbc6bfa5f54d2467 Mon Sep 17 00:00:00 2001 From: AnJia Date: Mon, 11 Mar 2024 14:07:56 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=BA=E7=9C=81docke?= =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 67b8fbd..60d0c93 100644 --- a/main.go +++ b/main.go @@ -37,7 +37,7 @@ docker login -u{{ .RegistryUser }} {{ .Registry }} #下载并重命名镜像 docker pull {{ .TargetImageName }} {{ if .Platform }} --platform {{ .Platform }} {{ end }} -docker tag {{ .TargetImageName }} {{ (split .OriginImageName "@")._0 }} +docker tag {{ .TargetImageName }} {{ index (split .OriginImageName "@") 0 }} docker images | grep $(echo {{ .OriginImageName }} |awk -F':' '{print $1}') From 6cff4fd584d4c4a539942bb0c5c234af203aae08 Mon Sep 17 00:00:00 2001 From: AnJia Date: Tue, 12 Mar 2024 18:44:41 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E6=94=AF=E6=8C=81=E7=BC=BA=E7=9C=81docke?= =?UTF-8?q?r=E6=B3=A8=E5=86=8C=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.go b/main.go index 60d0c93..d6a69f7 100644 --- a/main.go +++ b/main.go @@ -206,7 +206,7 @@ func mirrorByIssues(issues *github.Issue, config *Config) (err error, originImag platform = names[1] } - if strings.Index(originImageName, ".") < 0 { + if strings.Index(originImageName, ".") > strings.Index(originImageName, "/") { originImageName = "docker.io/" + originImageName } From 669c0145c6a4d3c4e1c5d6b8548ecf48c8c99573 Mon Sep 17 00:00:00 2001 From: AnJia Date: Tue, 11 Jun 2024 11:31:40 +0800 Subject: [PATCH 18/18] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0cb2b68..80c260f 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,7 @@ Fork/分叉代码自行维护 - 可选: 修改 [./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 为空即可