Skip to content

Commit

Permalink
add riscv64 support to Ubuntu images (#509)
Browse files Browse the repository at this point in the history
  • Loading branch information
gdams authored Aug 21, 2024
1 parent d13a1cc commit c031e92
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 7 deletions.
4 changes: 4 additions & 0 deletions 17/jdk/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ RUN set -eux; \
ESUM='c97988e5a99b8ae0c47ba330b0883398c7433312db0051d8c5ff97911bae1605'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.12_7.tar.gz'; \
;; \
riscv64) \
ESUM='f54c301e3ed3250b3f11cb06eeb799e4aa871477b1ce8bf9fec9fee8ce6beb96'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jdk_riscv64_linux_hotspot_17.0.11_9.tar.gz'; \
;; \
s390x) \
ESUM='e244947f4c9176bd559598874b6ecaafcabba19c7067271cebb78708c2e9d14f'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jdk_s390x_linux_hotspot_17.0.12_7.tar.gz'; \
Expand Down
4 changes: 4 additions & 0 deletions 17/jre/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ RUN set -eux; \
ESUM='2759c48e1e56117871b04c851af18b92b6992cf67590f602949b96c3cff15c73'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.12_7.tar.gz'; \
;; \
riscv64) \
ESUM='e814bfe176ee1d1dc8054571070a0f98fc6a87477382d84df7c6bed27622f97e'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.11%2B9/OpenJDK17U-jre_riscv64_linux_hotspot_17.0.11_9.tar.gz'; \
;; \
s390x) \
ESUM='cb1a3857d10e9353862761ce3c6b45573a736ea95cea44bc02dc3a703e57255a'; \
BINARY_URL='https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.12%2B7/OpenJDK17U-jre_s390x_linux_hotspot_17.0.12_7.tar.gz'; \
Expand Down
4 changes: 4 additions & 0 deletions 21/jdk/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ RUN set -eux; \
ESUM='c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz'; \
;; \
riscv64) \
ESUM='246acb1db3ef69a7e3328fa378513b2e606e64710626ae8dd29decc0e525359b'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_riscv64_linux_hotspot_21.0.3_9.tar.gz'; \
;; \
s390x) \
ESUM='c900c8d64fab1e53274974fa4a4c736a5a3754485a5c56f4947281480773658a'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_s390x_linux_hotspot_21.0.4_7.tar.gz'; \
Expand Down
4 changes: 4 additions & 0 deletions 21/jre/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ RUN set -eux; \
ESUM='46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz'; \
;; \
riscv64) \
ESUM='83cae236bf823b6d6525a255f1e4ebd7bdb2e40e3778d1eb4d34b43478a680f9'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jre_riscv64_linux_hotspot_21.0.3_9.tar.gz'; \
;; \
s390x) \
ESUM='7fb5b09987cb41de5118fecb5a81771b3a38a245cff411b39af33dbfbca3e760'; \
BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_s390x_linux_hotspot_21.0.4_7.tar.gz'; \
Expand Down
4 changes: 4 additions & 0 deletions 22/jdk/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ RUN set -eux; \
ESUM='46527cfc560552f05c0462520d69d438f144a3dc8206687952387c910cdd4c40'; \
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jdk_s390x_linux_hotspot_22.0.2_9.tar.gz'; \
;; \
riscv64) \
ESUM='767bbe2b9581272b6ac435b8c62bb1c079041d6ff2a1c39552d4403b4d7170f5'; \
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jdk_riscv64_linux_hotspot_22.0.1_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
exit 1; \
Expand Down
4 changes: 4 additions & 0 deletions 22/jre/ubuntu/noble/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,10 @@ RUN set -eux; \
ESUM='4d9bc998c29fffcbbf752e9d0bf32391928a9e7a46edb1c5706e0f55b34a0c56'; \
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.2%2B9/OpenJDK22U-jre_s390x_linux_hotspot_22.0.2_9.tar.gz'; \
;; \
riscv64) \
ESUM='15193b64eac9a5ade9fc7d20fe90b9769887c0195afb20442d2a6adeb07c140f'; \
BINARY_URL='https://github.com/adoptium/temurin22-binaries/releases/download/jdk-22.0.1%2B8/OpenJDK22U-jre_riscv64_linux_hotspot_22.0.1_8.tar.gz'; \
;; \
*) \
echo "Unsupported arch: ${ARCH}"; \
exit 1; \
Expand Down
8 changes: 1 addition & 7 deletions config/hotspot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,25 +20,19 @@ configurations:
linux:
- directory: ubuntu/noble
image: ubuntu:24.04
architectures: [aarch64, arm, ppc64le, s390x, x64]
# `bash` is required for Ubuntu-based images to correctly resolve
# environment variables.with.dots.in.them.
architectures: [aarch64, arm, ppc64le, riscv64, s390x, x64]
os: ubuntu

- directory: ubuntu/jammy
image: ubuntu:22.04
architectures: [aarch64, arm, ppc64le, s390x, x64]
deprecated: 23
# `bash` is required for Ubuntu-based images to correctly resolve
# environment variables.with.dots.in.them.
os: ubuntu

- directory: ubuntu/focal
architectures: [aarch64, arm, ppc64le, s390x, x64]
image: ubuntu:20.04
deprecated: 20
# `bash` is required for Ubuntu-based images to correctly resolve
# environment variables.with.dots.in.them.
os: ubuntu

- directory: ubi/ubi9-minimal
Expand Down

0 comments on commit c031e92

Please sign in to comment.