Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ use_repo(go_deps, "com_github_spdx_tools_golang")
### BUSYBOX ###
busybox = use_extension("//private/extensions:busybox.bzl", "busybox")
busybox.archive()
use_repo(busybox, "busybox_amd64", "busybox_arm", "busybox_arm64", "busybox_ppc64le", "busybox_s390x")
use_repo(busybox, "busybox_amd64", "busybox_arm", "busybox_arm64", "busybox_ppc64le", "busybox_riscv64", "busybox_s390x")

### JAVA ###
include("//private/repos/java_temurin:java.MODULE.bazel")
Expand Down
24 changes: 18 additions & 6 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@ Any other tags are considered deprecated and are no longer updated

Debian 13 distroless images use the debian [UsrMerge](https://wiki.debian.org/UsrMerge) scheme. If you use `rules_distroless` to add packages to an image, set `mergedusr = True` in [`apt.install`](https://registry.bazel.build/docs/rules_distroless#apt_install).

| Image | Tags | Architecture Suffixes |
| ------------------------------------- | ------------------------------------- | --------------------------------- |
| gcr.io/distroless/static-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/base-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/base-nossl-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/cc-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/java-base-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le |
| gcr.io/distroless/java21-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le |
| gcr.io/distroless/java25-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le |
| gcr.io/distroless/nodejs20-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/nodejs22-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/nodejs24-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le |
| gcr.io/distroless/python3-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64 |
| Image | Tags | Architecture Suffixes |
| ------------------------------------- | ------------------------------------- | ------------------------------------------ |
| gcr.io/distroless/static-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
| gcr.io/distroless/base-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
| gcr.io/distroless/base-nossl-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
| gcr.io/distroless/cc-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le, riscv64 |
| gcr.io/distroless/java-base-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le, riscv64 |
| gcr.io/distroless/java21-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le, riscv64 |
| gcr.io/distroless/java25-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le, riscv64 |
| gcr.io/distroless/nodejs20-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/nodejs22-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, arm, s390x, ppc64le |
| gcr.io/distroless/nodejs24-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64, s390x, ppc64le |
| gcr.io/distroless/python3-debian13 | latest, nonroot, debug, debug-nonroot | amd64, arm64 |

## Why is distroless still using `gcr.io` instead of `pkg.dev`?

Expand Down
2 changes: 1 addition & 1 deletion base/config.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
BASE_DISTROS = ["debian12", "debian13"]
BASE_ARCHITECTURES = {
"debian12": ["amd64", "arm64", "arm", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "arm", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "arm", "s390x", "ppc64le", "riscv64"],
}

BASE_PACKAGES = {
Expand Down
2 changes: 1 addition & 1 deletion cc/config.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CC_DISTROS = ["debian12", "debian13"]
CC_ARCHITECTURES = {
"debian12": ["amd64", "arm64", "arm", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "arm", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "arm", "s390x", "ppc64le", "riscv64"],
}

CC_PACKAGES = {
Expand Down
2 changes: 1 addition & 1 deletion distro.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ VARIANTS = {
"arm64": "v8",
}

ALL_ARCHITECTURES = ["amd64", "arm64", "arm", "s390x", "ppc64le"]
ALL_ARCHITECTURES = ["amd64", "arm64", "arm", "s390x", "ppc64le", "riscv64"]
ALL_DISTROS = ["debian12", "debian13"]
2 changes: 1 addition & 1 deletion java/config.bzl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
JAVA_DISTROS = ["debian12", "debian13"]
JAVA_ARCHITECTURES = {
"debian12": ["amd64", "arm64", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "s390x", "ppc64le"],
"debian13": ["amd64", "arm64", "s390x", "ppc64le", "riscv64"],
}
JAVA_MAJOR_VERSIONS = {
"debian12": ["17", "21"],
Expand Down
13 changes: 13 additions & 0 deletions private/extensions/busybox.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,26 @@ def _busybox_impl(module_ctx):
build_file_content = BUSYBOX_ARCHIVE_BUILD,
)

# To update riscv64 busybox binary
# Get the latest commit hash from dist-riscv64 branch of docker-library repo. You can also view it
# at https://github.com/docker-library/official-images/blob/master/library/busybox
# Substitute it in the link: https://github.com/docker-library/busybox/raw/<latest-commit-hash>/latest/musl/busybox.tar.gz
# Update the sha256 value. Since github api doesn't give sha256 value, it can be obtained using sha256sum command.
http_archive(
name = "busybox_riscv64",
sha256 = "17737180c892fb9eac75524ae789040f0b01415e6e05e063bc2b8f982b340d97",
urls = ["https://raw.githubusercontent.com/docker-library/busybox/eabe7cf678f2abbc0477a8603428519771ede877/latest/musl/riscv64/rootfs.tar.gz"],
build_file_content = BUSYBOX_ARCHIVE_BUILD,
)

return module_ctx.extension_metadata(
root_module_direct_deps = [
"busybox_amd64",
"busybox_arm",
"busybox_arm64",
"busybox_s390x",
"busybox_ppc64le",
"busybox_riscv64",
],
root_module_direct_dev_deps = [],
)
Expand Down
165 changes: 165 additions & 0 deletions private/repos/deb/trixie.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,171 @@
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/gcc-14/libstdc++6_14.2.0-19_ppc64el.deb"
],
"version": "14.2.0-19"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "base-files_13.8-p-deb13u3_riscv64",
"name": "base-files",
"sha256": "72b65aa9a24ecc95fc9db64d6da28771e4833af49534cd815ba1ac45cdeafb12",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/b/base-files/base-files_13.8+deb13u3_riscv64.deb"
],
"version": "13.8+deb13u3"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "ca-certificates_20250419_riscv64",
"name": "ca-certificates",
"sha256": "ef590f89563aa4b46c8260d49d1cea0fc1b181d19e8df3782694706adf05c184",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/c/ca-certificates/ca-certificates_20250419_all.deb"
],
"version": "20250419"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libc6_2.41-12-p-deb13u1_riscv64",
"name": "libc6",
"sha256": "02061995da9e91f4a75c547254343f9e0e4d53ba30cf475adef4fd55467cfe0c",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/glibc/libc6_2.41-12+deb13u1_riscv64.deb"
],
"version": "2.41-12+deb13u1"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libc-bin_2.41-12-p-deb13u1_riscv64",
"name": "libc-bin",
"sha256": "5f9b3c864154422529b2da03e3018a07a63a9796a6da47875121896cdc3dc343",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/glibc/libc-bin_2.41-12+deb13u1_riscv64.deb"
],
"version": "2.41-12+deb13u1"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libssl3t64_3.5.4-1_deb13u2_riscv64",
"name": "libssl3t64",
"sha256": "30e9c43603b8d5ba5a25e2e69254f9651def1c8d90873b8962f3d99db35b84b6",
"urls": [
"https://snapshot.debian.org/archive/debian-security/20260218T203007Z/pool/updates/main/o/openssl/libssl3t64_3.5.4-1~deb13u2_riscv64.deb"
],
"version": "3.5.4-1~deb13u2"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "netbase_6.5_riscv64",
"name": "netbase",
"sha256": "76bafa92947ebd37b0a6f9ec6570412041f56edebc1c66d323731216d318471e",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/n/netbase/netbase_6.5_all.deb"
],
"version": "6.5"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "openssl_3.5.4-1_deb13u2_riscv64",
"name": "openssl",
"sha256": "211770235d2a0d25c059181d51cb2e578e3ee8fcd8b5bcb53b85bbc9b87593e1",
"urls": [
"https://snapshot.debian.org/archive/debian-security/20260218T203007Z/pool/updates/main/o/openssl/openssl_3.5.4-1~deb13u2_riscv64.deb"
],
"version": "3.5.4-1~deb13u2"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "tzdata_2025b-4-p-deb13u1_riscv64",
"name": "tzdata",
"sha256": "19a87f5184503fb5eeffe97bd7e107e193ac28107789a1e85331ed9381040f17",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/t/tzdata/tzdata_2025b-4+deb13u1_all.deb"
],
"version": "2025b-4+deb13u1"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "media-types_13.0.0_riscv64",
"name": "media-types",
"sha256": "0788e4b0b72db1bcf74a19cb24c3511e7770ad0b341f0f30e361701c3072f53e",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/m/media-types/media-types_13.0.0_all.deb"
],
"version": "13.0.0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "zlib1g_1-1.3.dfsg-p-really1.3.1-1-p-b1_riscv64",
"name": "zlib1g",
"sha256": "38c52eef58e5fc9b13d93f8a7d0a0549c32b4f00402a778d39a135254f554314",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/z/zlib/zlib1g_1.3.dfsg+really1.3.1-1+b1_riscv64.deb"
],
"version": "1:1.3.dfsg+really1.3.1-1+b1"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libzstd1_1.5.7-p-dfsg-1_riscv64",
"name": "libzstd1",
"sha256": "5967f5f97bfb6e7a8036d4e615c0ecd6861a9bb686bd60ee0c81422581faf0ad",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/libz/libzstd/libzstd1_1.5.7+dfsg-1_riscv64.deb"
],
"version": "1.5.7+dfsg-1"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "gcc-14-base_14.2.0-19_riscv64",
"name": "gcc-14-base",
"sha256": "bb871e84c5c108463fa6a858e72f15cbf809f3888442b89941fc625449874206",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/gcc-14/gcc-14-base_14.2.0-19_riscv64.deb"
],
"version": "14.2.0-19"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libgcc-s1_14.2.0-19_riscv64",
"name": "libgcc-s1",
"sha256": "16d3f9f534028615413d23f649e5d246baef48fe7db739ad564ef8b9a6e5587c",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/gcc-14/libgcc-s1_14.2.0-19_riscv64.deb"
],
"version": "14.2.0-19"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libgomp1_14.2.0-19_riscv64",
"name": "libgomp1",
"sha256": "0d457810c609eed431d438aa3e7a0c5a6974d3dca8e16ecd8fe38a949ba63b0f",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/gcc-14/libgomp1_14.2.0-19_riscv64.deb"
],
"version": "14.2.0-19"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "libstdc-p--p-6_14.2.0-19_riscv64",
"name": "libstdc++6",
"sha256": "f285313f34e0d8f65463c669fac8eb29760a3f3fd6459005dd3110cdd2b10fd7",
"urls": [
"https://snapshot.debian.org/archive/debian/20260218T203007Z/pool/main/g/gcc-14/libstdc++6_14.2.0-19_riscv64.deb"
],
"version": "14.2.0-19"
}
],
"version": 1
Expand Down
1 change: 1 addition & 0 deletions private/repos/deb/trixie.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ archs:
- armhf
- s390x
- ppc64el
- riscv64

packages:
- base-files
Expand Down
66 changes: 66 additions & 0 deletions private/repos/deb/trixie_adoptium.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,72 @@
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jdk_25.0.2.0.0+10-0_ppc64el.deb"
],
"version": "25.0.2.0.0+10-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-17-jre_17.0.18.0.0-p-8-0_riscv64",
"name": "temurin-17-jre",
"sha256": "0dcc823cfa1757c2f3739b59ce8ebfe32f2d619343ef77dfb501bf79a5165748",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-17/temurin-17-jre_17.0.18.0.0+8-0_riscv64.deb"
],
"version": "17.0.18.0.0+8-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-17-jdk_17.0.18.0.0-p-8-0_riscv64",
"name": "temurin-17-jdk",
"sha256": "92fe04052404438f5b65173c2cc9feb760cdab2992d0f4feb7dc32452532be0c",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-17/temurin-17-jdk_17.0.18.0.0+8-0_riscv64.deb"
],
"version": "17.0.18.0.0+8-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-21-jre_21.0.10.0.0-p-7-0_riscv64",
"name": "temurin-21-jre",
"sha256": "0518002b3ce24936615f2996ec9bc29b6e868a5156f134df16c6a271edfe54a8",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jre_21.0.10.0.0+7-0_riscv64.deb"
],
"version": "21.0.10.0.0+7-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-21-jdk_21.0.10.0.0-p-7-0_riscv64",
"name": "temurin-21-jdk",
"sha256": "c85788afa927d86254b351d9a5af6628a7cad7182c8e700469d0244f296fa6b4",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-21/temurin-21-jdk_21.0.10.0.0+7-0_riscv64.deb"
],
"version": "21.0.10.0.0+7-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-25-jre_25.0.2.0.0-p-10-0_riscv64",
"name": "temurin-25-jre",
"sha256": "c93c327e0aa5b7a1d249ddadfe4ba071a7fcda1b7c82a33f2d5ff4931d6ad51d",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jre_25.0.2.0.0+10-0_riscv64.deb"
],
"version": "25.0.2.0.0+10-0"
},
{
"arch": "riscv64",
"dependencies": [],
"key": "temurin-25-jdk_25.0.2.0.0-p-10-0_riscv64",
"name": "temurin-25-jdk",
"sha256": "99eebd085906b13f7b25fc26b8cc85d3f6635373f0a9d202b916445f243cd0b5",
"urls": [
"https://packages.adoptium.net/artifactory/deb/pool/main/t/temurin-25/temurin-25-jdk_25.0.2.0.0+10-0_riscv64.deb"
],
"version": "25.0.2.0.0+10-0"
}
],
"version": 1
Expand Down
1 change: 1 addition & 0 deletions private/repos/deb/trixie_adoptium.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ archs:
- arm64
- s390x
- ppc64el
- riscv64

packages:
- temurin-17-jre
Expand Down
Loading
Loading