Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update base image to ubi9 cuda base #39

Merged
merged 1 commit into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .common-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ stages:
- sign

# Define the distribution targets
.dist-ubi8:
.dist-ubi9:
variables:
DIST: ubi8
DIST: ubi9
CVE_UPDATES: "cyrus-sasl-lib"

# Define the platform targets
Expand Down Expand Up @@ -138,9 +138,9 @@ stages:
OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}"

# Define the release jobs
release:staging-ubi8:
release:staging-ubi9:
extends:
- .release:staging
- .dist-ubi8
- .dist-ubi9
needs:
- image-ubi8
- image-ubi9
2 changes: 1 addition & 1 deletion .github/workflows/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dist: [ubi8]
dist: [ubi9]
steps:
- uses: actions/checkout@v4

Expand Down
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ include:
script:
- make -f deployments/container/Makefile build-${DIST}

image-ubi8:
image-ubi9:
extends:
- .image-build
- .dist-ubi8
- .dist-ubi9
28 changes: 14 additions & 14 deletions .nvidia-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ variables:
- regctl registry login "${OUT_REGISTRY}" -u "${OUT_REGISTRY_USER}" -p "${OUT_REGISTRY_TOKEN}"
- make -f deployments/container/Makefile IMAGE=${IN_REGISTRY}/${IN_IMAGE_NAME}:${IN_VERSION}-${DIST} OUT_IMAGE=${OUT_IMAGE_NAME}:${CI_COMMIT_SHORT_SHA}-${DIST} push-${DIST}

image-ubi8:
image-ubi9:
extends:
- .image-pull
- .dist-ubi8
- .dist-ubi9

# We skip the integration tests for the internal CI:
.integration:
Expand Down Expand Up @@ -110,28 +110,28 @@ image-ubi8:
- vulns.json
- policy_evaluation.json

# The .scan-ubi8 steps forms the base for all ubi8 image scans across supported architectures
.scan-ubi8:
# The .scan-ubi9 steps forms the base for all ubi9 image scans across supported architectures
.scan-ubi9:
extends:
- .scan
- .dist-ubi8
- .dist-ubi9
needs:
- image-ubi8
- image-ubi9

# Define the scan targets
scan-ubi8-amd64:
scan-ubi9-amd64:
extends:
- .scan-ubi8
- .scan-ubi9
- .platform-amd64

scan-ubi8-arm64:
scan-ubi9-arm64:
extends:
- .scan-ubi8
- .scan-ubi9
- .platform-arm64
# For now, run the scans sequentially to avoid any issues
# when pulling the same tag, but different arch, on the gitlab runner
needs:
- scan-ubi8-amd64
- scan-ubi9-amd64

# Define the external release helpers
.release:ngc:
Expand All @@ -144,10 +144,10 @@ scan-ubi8-arm64:

# Define the external release targets
# Release to NGC
release:ngc-ubi8:
release:ngc-ubi9:
extends:
- .release:ngc
- .dist-ubi8
- .dist-ubi9

# Define the external image signing steps for NGC
# Download the ngc cli binary for use in the sign steps
Expand Down Expand Up @@ -192,7 +192,7 @@ sign:ngc:
parallel:
matrix:
- SIGN_JOB_NAME: [""]
DIST: ["CI_COMMIT_TAG", "ubi8"]
DIST: ["CI_COMMIT_TAG", "ubi9"]
rules:
- if: '$DIST == "CI_COMMIT_TAG"'
variables:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi8 AS build
FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi9 AS build

WORKDIR /work

Expand Down Expand Up @@ -41,7 +41,7 @@ ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH

RUN GOOS=linux go build -o nvdrain ./cmd/nvdrain

FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi8
FROM nvcr.io/nvidia/cuda:12.6.0-base-ubi9

ARG TARGETARCH

Expand Down
6 changes: 3 additions & 3 deletions deployments/container/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)

##### Public rules #####
DISTRIBUTIONS := ubi8
DEFAULT_PUSH_TARGET := ubi8
DISTRIBUTIONS := ubi9
DEFAULT_PUSH_TARGET := ubi9

PUSH_TARGETS := $(patsubst %, push-%, $(DISTRIBUTIONS))
BUILD_TARGETS := $(patsubst %, build-%, $(DISTRIBUTIONS))
Expand Down Expand Up @@ -72,7 +72,7 @@ build-%: DIST = $(*)
build-%: DOCKERFILE_SUFFIX = $(*)
build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)

# Both ubi8 and build-ubi8 trigger a build of the relevant image
# Both ubi9 and build-ubi9 trigger a build of the relevant image
$(DISTRIBUTIONS): %: build-%
$(BUILD_TARGETS): build-%:
DOCKER_BUILDKIT=1 \
Expand Down