Skip to content

Commit

Permalink
CASMCMS-9082: Build Docker image on SLE15 SP6 (up from SP4)
Browse files Browse the repository at this point in the history
  • Loading branch information
mharding-hpe committed Aug 8, 2024
1 parent ef2e624 commit 318cbb5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Dependencies

- CASMCMS-9082: Build Docker image on SLE15 SP6 (up from SP4)

## [1.22.0] - 2024-06-25

### Added
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
#
# Dockerfile for importing CSM content into gitea, to be used with CFS

FROM artifactory.algol60.net/registry.suse.com/suse/sle15:15.4 as product-content-base
FROM artifactory.algol60.net/registry.suse.com/suse/sle15:15.6 as product-content-base
WORKDIR /

ARG SP=4
ARG SP=6
ARG ARCH=x86_64

# Pin the version of csm-ssh-keys being installed. The actual version is substituted by
Expand Down
7 changes: 6 additions & 1 deletion zypper-docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ for MODULE in Basesystem Certifications Containers Desktop-Applications Developm
do
add_zypper_repos "Module-${MODULE}"
done
for PRODUCT in HA HPC SLED SLES SLES_SAP WE; do
PRODUCTS="HA SLED SLES SLES_SAP WE"
if [[ ${SP} -lt 6 ]]; then
# HPC is deprecated in SP6, but we want to include it for previous SPs
PRODUCTS="${PRODUCTS} HPC"
fi
for PRODUCT in $PRODUCTS; do
add_zypper_repos "Product-${PRODUCT}"
done
zypper --non-interactive ar --no-gpgcheck "${CSM_SLES_REPO_URL}" csm-sles
Expand Down

0 comments on commit 318cbb5

Please sign in to comment.