From 5d6e630f9524b2f7bf20dfea2e244df71fa52f7a Mon Sep 17 00:00:00 2001 From: Alan Yeh Date: Tue, 22 Oct 2024 01:02:34 +0800 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20=E6=9B=B4=E6=96=B0=20Android=20?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alan Yeh --- android/README.md | 17 +++++++++-------- android/docker-bake.hcl | 6 +++--- openjdk/docker-bake.hcl | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/android/README.md b/android/README.md index 3aa546a..ffd0f8e 100644 --- a/android/README.md +++ b/android/README.md @@ -4,14 +4,15 @@ ## 版本号 -| 镜像版本号 | sdkmanager 版本号 | cmdline-tools 文件 | Java 版本号 | 发布日期 | -|--------|----------------|--------------------------------------------|----------|------------| -| latest | 12.0 | commandlinetools-linux-11076708_latest.zip | 17 | 2023/12/07 | -| 12.0 | 12.0 | commandlinetools-linux-11076708_latest.zip | 17 | 2023/12/07 | -| 11.0 | 11.0 | commandlinetools-linux-10406996_latest.zip | 17 | 2023/07/27 | -| 10.0 | 10.0 | commandlinetools-linux-9862592_latest.zip | 11 | 2023/07/27 | -| 9.0 | 9.0 | commandlinetools-linux-9477386_latest.zip | 11 | 2023/01/17 | -| 8.0 | 8.0 | commandlinetools-linux-9123335_latest.zip | 8 | 2022/09/30 | +| 镜像版本号 | tools 版本号 | cmdline-tools 文件 | Java 版本号 | +|--------|-----------|--------------------------------------------|----------| +| latest | 13.0 | commandlinetools-linux-11479570_latest.zip | 17 | +| 13.0 | 13.0 | commandlinetools-linux-11479570_latest.zip | 17 | +| 12.0 | 12.0 | commandlinetools-linux-11076708_latest.zip | 17 | +| 11.0 | 11.0 | commandlinetools-linux-10406996_latest.zip | 17 | +| 10.0 | 10.0 | commandlinetools-linux-9862592_latest.zip | 11 | +| 9.0 | 9.0 | commandlinetools-linux-9477386_latest.zip | 11 | +| 8.0 | 8.0 | commandlinetools-linux-9123335_latest.zip | 8 | ## 镜像标准   本镜像遵守以下构建标准: diff --git a/android/docker-bake.hcl b/android/docker-bake.hcl index 03670a0..58f57d9 100644 --- a/android/docker-bake.hcl +++ b/android/docker-bake.hcl @@ -50,14 +50,14 @@ target "android" { dockerfile = "Dockerfile" labels = { "org.opencontainers.image.title" = "android" - "org.opencontainers.image.version" = "12.0" + "org.opencontainers.image.version" = "13.0" } args = { GOSU_VERSION = "${GOSU_VERSION}" - CMDLINE_PACKAGE = "https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip" + CMDLINE_PACKAGE = "https://dl.google.com/android/repository/commandlinetools-linux-11479570_latest.zip" } tags = [ "docker.io/centralx/android:latest", - "docker.io/centralx/android:12.0" + "docker.io/centralx/android:13.0" ] } \ No newline at end of file diff --git a/openjdk/docker-bake.hcl b/openjdk/docker-bake.hcl index 5144e8a..bec7216 100644 --- a/openjdk/docker-bake.hcl +++ b/openjdk/docker-bake.hcl @@ -30,7 +30,7 @@ target "_labels" { } #*************************************************************************** -# Global Function +# Global Argument #*************************************************************************** variable "ENV_VERSION" { default = "all"