Update build docker container workflow, opensuse dockerfiles (#1883)
## Motivation <!-- Explain the purpose of this PR and the goals it aims to achieve. --> - __Reduced Code Duplication__: Version parsing logic moved from individual Dockerfiles to the central build script - __Improved Edge Case Handling__: Better handling of ROCm versions with and without patch numbers (e.g., `6.2` vs `6.2.0`) - __Easier Maintenance__: Future version-related changes only need to be made in one place - __Cleaner Dockerfiles__: Simplified Dockerfiles focus on package installation rather than complex shell logic - __Updated Platform Support__: Refreshed container matrix to reflect current platform/ROCm version combinations - __Fix OpenSUSE Docker Generation__: OpenSUSE container generation fails due to a change to the `binutils-gold` package - __Error Handling__: Fix bug where errors in docker image build were being masked, allowing workflow to pass anyway. ## Technical Details <!-- Explain the changes along with any relevant GitHub links. --> - Updated `Dockerfile.opensuse` and `Dockerfile.opensuse.ci` docker files to remove `binutils-gold` - Not needed since we build `binutils` with systems anyways - Updated `rocprofiler-systems-containers.yml` to remove `pushd/popd` commands and just run the shell scripts - There was a silent failure observed here, which I verified in this PR before adding the fix for openSUSE - Refactor ROCm version parsing. Move this logic to the `build-docker.sh` script to reduce duplication. - Fix bug that caused ROCm 7.0 to fail installation. The trailing `.0` was being trimmed. - Fixed inconsistencies in `containers.yml` that lead to invalid ROCm-OS_VERSION combinations. - Formatting fixes - Removed trailing whitespace - Fix docker build warnings. Use an `=` rather than ` ` when assigning an environment variable.
Bu işleme şunda yer alıyor:
işlemeyi yapan:
GitHub
ebeveyn
0f76bb45c7
işleme
463126770a
@@ -69,7 +69,7 @@ jobs:
|
||||
with:
|
||||
username: ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }}
|
||||
password: ${{ secrets.ROCPROF_SYS_DOCKER_TOKEN }}
|
||||
|
||||
|
||||
- name: Build CI Container (PR - No Push)
|
||||
if: github.event_name == 'pull_request'
|
||||
timeout-minutes: 45
|
||||
@@ -79,7 +79,7 @@ jobs:
|
||||
timeout_minutes: 45
|
||||
max_attempts: 3
|
||||
command: |
|
||||
pushd projects/rocprofiler-systems/docker
|
||||
cd projects/rocprofiler-systems/docker
|
||||
./build-docker-ci.sh \
|
||||
--distro ${{ matrix.distro }} \
|
||||
--versions ${{ matrix.version }} \
|
||||
@@ -87,7 +87,6 @@ jobs:
|
||||
--jobs 2 \
|
||||
--elfutils-version 0.188 \
|
||||
--boost-version 1.79.0
|
||||
popd
|
||||
|
||||
- name: Build Base Container (Push)
|
||||
if: github.event_name != 'pull_request'
|
||||
@@ -98,7 +97,7 @@ jobs:
|
||||
timeout_minutes: 45
|
||||
max_attempts: 3
|
||||
command: |
|
||||
pushd projects/rocprofiler-systems/docker
|
||||
cd projects/rocprofiler-systems/docker
|
||||
./build-docker-ci.sh \
|
||||
--distro ${{ matrix.distro }} \
|
||||
--versions ${{ matrix.version }} \
|
||||
@@ -107,7 +106,6 @@ jobs:
|
||||
--elfutils-version 0.188 \
|
||||
--boost-version 1.79.0 \
|
||||
--push
|
||||
popd
|
||||
|
||||
prepare_matrix_release:
|
||||
if: github.repository == 'ROCm/rocm-systems'
|
||||
@@ -126,7 +124,7 @@ jobs:
|
||||
run: |
|
||||
MATRIX_CONTENT=$(cat containers.yml | yq '.matrix' -I=0 -o=json)
|
||||
echo "matrix_data=$MATRIX_CONTENT" >> $GITHUB_OUTPUT
|
||||
|
||||
|
||||
rocprofiler-systems-release:
|
||||
needs: prepare_matrix_release
|
||||
runs-on: ubuntu-latest
|
||||
@@ -135,7 +133,7 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include: ${{ fromJSON(needs.prepare_matrix_release.outputs.matrix_data) }}
|
||||
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
@@ -162,14 +160,13 @@ jobs:
|
||||
timeout_minutes: 45
|
||||
max_attempts: 3
|
||||
command: |
|
||||
pushd projects/rocprofiler-systems/docker
|
||||
cd projects/rocprofiler-systems/docker
|
||||
./build-docker.sh \
|
||||
--distro ${{ matrix.os-distro }} \
|
||||
--versions ${{ matrix.os-version }} \
|
||||
--rocm-versions ${{ matrix.rocm-version }} \
|
||||
--user ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }}
|
||||
popd
|
||||
|
||||
|
||||
- name: Build Base Container (Push)
|
||||
if: github.event_name != 'pull_request'
|
||||
timeout-minutes: 45
|
||||
@@ -179,11 +176,10 @@ jobs:
|
||||
timeout_minutes: 45
|
||||
max_attempts: 3
|
||||
command: |
|
||||
pushd projects/rocprofiler-systems/docker
|
||||
cd projects/rocprofiler-systems/docker
|
||||
./build-docker.sh \
|
||||
--distro ${{ matrix.os-distro }} \
|
||||
--versions ${{ matrix.os-version }} \
|
||||
--rocm-versions ${{ matrix.rocm-version }} \
|
||||
--user ${{ secrets.ROCPROF_SYS_DOCKER_LOGIN }} \
|
||||
--push
|
||||
popd
|
||||
|
||||
Yeni konuda referans
Bir kullanıcı engelle