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.
This commit is contained in:
@@ -27,10 +27,10 @@ RUN set +e; \
|
||||
RUN zypper --non-interactive update -y && \
|
||||
zypper --non-interactive dist-upgrade -y && \
|
||||
zypper --non-interactive install -y -t pattern devel_basis && \
|
||||
zypper --non-interactive install -y binutils-gold chrpath cmake curl dpkg-devel \
|
||||
gcc-c++ gcc-fortran git gmock gtest iproute2 libnuma-devel ninja nlohmann_json-devel \
|
||||
openmpi3-devel papi-devel python3-devel python3-pip \
|
||||
rpm-build sqlite3-devel vim wget && \
|
||||
zypper --non-interactive install -y chrpath cmake curl dpkg-devel \
|
||||
gcc-c++ gcc-fortran git gmock gtest iproute2 ninja nlohmann_json-devel \
|
||||
openmpi3-devel papi-devel python3-devel python3-pip rpm-build \
|
||||
sqlite3-devel vim wget && \
|
||||
zypper --non-interactive clean --all && \
|
||||
python3 -m pip install 'cmake==3.21' perfetto
|
||||
|
||||
|
||||
Reference in New Issue
Block a user