From 66a6650b91c4c132577a4bce2a322c996f01913a Mon Sep 17 00:00:00 2001 From: ben0i0d Date: Sat, 8 Feb 2025 13:08:00 +0800 Subject: [PATCH] switch back to bookworm --- .gitea/workflows/Flow.yaml | 25 +++++++++++-------------- base/cpu/Dockerfile | 2 +- base/rocm/Dockerfile | 6 +++--- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/Flow.yaml b/.gitea/workflows/Flow.yaml index 9b5f6d1..05ad4c4 100644 --- a/.gitea/workflows/Flow.yaml +++ b/.gitea/workflows/Flow.yaml @@ -50,20 +50,17 @@ jobs: context: base/cuda/devel tags: eoelab.org:1027/${{ gitea.repository }}:cuda_devel - # ROCM: - # runs-on: runner - # needs: Base - # steps: - # - name: checkout code - # uses: https://eoelab.org:1027/actions/checkout@v4 - # - name: ROCM build - # uses: https://eoelab.org:1027/actions/build-push-action@v6 - # with: - # context: base/rocm - # build-args: | - # http_proxy=http://192.168.2.2:7890 - # https_proxy=http://192.168.2.2:7890 - # tags: eoelab.org:1027/${{ gitea.repository }}:rocm + ROCM: + runs-on: runner + needs: Base + steps: + - name: checkout code + uses: https://eoelab.org:1027/actions/checkout@v4 + - name: ROCM build + uses: https://eoelab.org:1027/actions/build-push-action@v6 + with: + context: base/rocm + tags: eoelab.org:1027/${{ gitea.repository }}:rocm C: runs-on: runner diff --git a/base/cpu/Dockerfile b/base/cpu/Dockerfile index e94d8b7..d22b1f3 100644 --- a/base/cpu/Dockerfile +++ b/base/cpu/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:trixie-slim +FROM debian:bookworm-slim USER root diff --git a/base/rocm/Dockerfile b/base/rocm/Dockerfile index 25896e5..72ac8e9 100644 --- a/base/rocm/Dockerfile +++ b/base/rocm/Dockerfile @@ -1,13 +1,13 @@ FROM eoelab.org:1027/eoeair/cenv:base -ARG VERSION=6.3.1 +ARG VERSION=6.3.2 ENV PATH="${PATH}:/opt/rocm/bin" RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates wget gnupg2 && \ - wget https://repo.radeon.com/amdgpu-install/6.3.1/ubuntu/jammy/amdgpu-install_6.3.60301-1_all.deb && \ + wget https://repo.radeon.com/amdgpu-install/6.3.2/ubuntu/jammy/amdgpu-install_6.3.60302-1_all.deb && \ # add ROCm - apt-get install -y ./amdgpu-install_6.3.60301-1_all.deb && rm ./amdgpu-install_6.3.60301-1_all.deb && \ + apt-get install -y ./amdgpu-install_6.3.60302-1_all.deb && rm ./amdgpu-install_6.3.60302-1_all.deb && \ # Install ROCm-ml-libraries apt-get update && apt-get update && apt-get install -y rocm-ml-libraries && \ apt-get clean && rm -rf /var/lib/apt/lists/*