add: better container builds (#9)

redhat-na-ssa · Oct 6, 2023 · 6f94dd3 · 6f94dd3
1 parent af1583b
commit 6f94dd3
Show file tree

Hide file tree

Showing 36 changed files with 434 additions and 1,329 deletions.
diff --git a/.github/workflows/build-udi-cuda-11.8.0.yaml b/.github/workflows/build-udi-cuda-11.8.0.yaml
@@ -0,0 +1,122 @@
+name: Publish Build 11.8.0
+
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+on:  # yamllint disable-line rule:truthy
+  # schedule:
+  #   - cron: '5 4 * * 6'
+  push:
+    branches: ["*"]
+    # Publish semver tags as releases.
+    # tags: ["v*.*.*"]
+    paths:
+      - "containers/udi-cuda/ubi8/**"
+      - "containers/python/ubi8/**"
+  pull_request:
+    branches: ["main"]
+    paths:
+      - "containers/udi-cuda/ubi8/**"
+      - "containers/python/ubi8/**"
+
+env:
+  IMAGE_NAME: udi-cuda
+  IMAGE_VERSION: 11.8.0
+  GHCR_REGISTRY: ghcr.io
+  GHCR_USER: ${{ github.repository_owner }}
+  GHCR_IMAGE: ${GHCR_REGISTRY}/${GHCR_USER}/${IMAGE_NAME}
+
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/[email protected]
+
+      - name: Prepare
+        id: prep
+        run: |
+          VERSION=${{ env.IMAGE_VERSION }}
+          GHCR_IMAGE=${{ env.GHCR_IMAGE }}
+          MINOR=${VERSION%.*}
+          MAJOR=${VERSION%%.*}
+          TAGS="${GHCR_IMAGE}:${VERSION}"
+          echo ::set-output name=name::${{ env.IMAGE_NAME }}
+          echo ::set-output name=tags::${TAGS}
+          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=ghcr_image::${GHCR_IMAGE}
+
+      # https://github.com/docker/login-action
+      - name: Log into GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/[email protected]
+        with:
+          registry: ${{ env.GHCR_REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # https://github.com/docker/metadata-action
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        with:
+          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push runtime
+        uses: docker/[email protected]
+        with:
+          context: containers/${{ steps.prep.outputs.name }}/ubi8
+          file: containers/${{ steps.prep.outputs.name }}/ubi8/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-cudnn8-runtime-ubi8
+            TARGETARCH=amd64
+          tags: ${{ steps.prep.outputs.tags }}-cudnn8-runtime-ubi8
+          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-cudnn8-runtime-ubi8
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push devel
+        uses: docker/[email protected]
+        with:
+          context: containers/${{ steps.prep.outputs.name }}/ubi8
+          file: containers/${{ steps.prep.outputs.name }}/ubi8/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
+            TARGETARCH=amd64
+          tags: ${{ steps.prep.outputs.tags }}-cudnn8-devel-ubi8
+          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
+
+      # https://github.com/docker/build-push-action
+      - name: Build and push devel python 3.9
+        uses: docker/[email protected]
+        with:
+          context: containers/python/ubi8/3.9
+          file: containers/python/ubi8/3.9/Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          build-args: |
+            IMAGE_NAME=${{ steps.prep.outputs.ghcr_image }}:${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
+            TARGETARCH=amd64
+          tags: ${{ steps.prep.outputs.tags }}-cudnn8-devel-ubi8-python39,${{ steps.prep.outputs.ghcr_image }}:latest
+          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
+
+      # # https://github.com/docker/build-push-action
+      # - name: Build and push devel python 3.11
+      #   uses: docker/[email protected]
+      #   with:
+      #     context: containers/python/ubi8/3.11
+      #     file: containers/python/ubi8/3.11/Dockerfile
+      #     push: ${{ github.event_name != 'pull_request' }}
+      #     build-args: |
+      #       IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
+      #       TARGETARCH=amd64
+      #     tags: ${{ steps.prep.outputs.tags }}-cudnn8-devel-ubi8-python311,${{ steps.prep.outputs.ghcr_image }}:latest
+      #     labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-cudnn8-devel-ubi8
diff --git a/.github/workflows/build-udi-cuda-12.2.0.yaml b/.github/workflows/build-udi-cuda-12.2.0.yaml
@@ -12,10 +12,14 @@ on:  # yamllint disable-line rule:truthy
     branches: ["*"]
     # Publish semver tags as releases.
     # tags: ["v*.*.*"]
-    paths: ["containers/udi-cuda/**"]
+    paths:
+      - "containers/udi-cuda/ubi8/**"
+      - "containers/python/ubi8/**"
   pull_request:
     branches: ["main"]
-    paths: ["containers/udi-cuda/**"]
+    paths:
+      - "containers/udi-cuda/ubi8/**"
+      - "containers/python/ubi8/**"
 
 env:
   IMAGE_NAME: udi-cuda
@@ -66,40 +70,53 @@ jobs:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
       # https://github.com/docker/build-push-action
-      - name: Build and push base
+      - name: Build and push runtime
         uses: docker/[email protected]
         with:
-          context: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/base
-          file: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/base/Dockerfile
+          context: containers/${{ steps.prep.outputs.name }}/ubi8
+          file: containers/${{ steps.prep.outputs.name }}/ubi8/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           build-args: |
-            IMAGE_NAME=quay.io/devfile/base-developer-image:ubi8-latest
+            IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-runtime-ubi8
             TARGETARCH=amd64
-          tags: ${{ steps.prep.outputs.tags }}-base-ubi8
-          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-base-ubi8
+          tags: ${{ steps.prep.outputs.tags }}-runtime-ubi8
+          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-runtime-ubi8
 
       # https://github.com/docker/build-push-action
-      - name: Build and push runtime
+      - name: Build and push devel
         uses: docker/[email protected]
         with:
-          context: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/runtime
-          file: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/runtime/Dockerfile
+          context: containers/${{ steps.prep.outputs.name }}/ubi8
+          file: containers/${{ steps.prep.outputs.name }}/ubi8/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           build-args: |
-            IMAGE_NAME=${{ steps.prep.outputs.ghcr_image }}
+            IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-devel-ubi8
             TARGETARCH=amd64
-          tags: ${{ steps.prep.outputs.tags }}-runtime-ubi8
-          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-runtime-ubi8
+          tags: ${{ steps.prep.outputs.tags }}-devel-ubi8
+          labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-devel-ubi8
 
-              # https://github.com/docker/build-push-action
-      - name: Build and push devel
+      # https://github.com/docker/build-push-action
+      - name: Build and push devel python 3.9
         uses: docker/[email protected]
         with:
-          context: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/devel
-          file: containers/${{ steps.prep.outputs.name }}/12.2.0/ubi8/devel/Dockerfile
+          context: containers/python/ubi8/3.9
+          file: containers/python/ubi8/3.9/Dockerfile
           push: ${{ github.event_name != 'pull_request' }}
           build-args: |
-            IMAGE_NAME=${{ steps.prep.outputs.ghcr_image }}
+            IMAGE_NAME=${{ steps.prep.outputs.ghcr_image }}:${{ steps.prep.outputs.version }}-devel-ubi8
             TARGETARCH=amd64
-          tags: ${{ steps.prep.outputs.tags }}-devel-ubi8
+          tags: ${{ steps.prep.outputs.tags }}-devel-ubi8-python39
           labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-devel-ubi8
+
+      # # https://github.com/docker/build-push-action
+      # - name: Build and push devel python 3.11
+      #   uses: docker/[email protected]
+      #   with:
+      #     context: containers/python/ubi8/3.11
+      #     file: containers/python/ubi8/3.11/Dockerfile
+      #     push: ${{ github.event_name != 'pull_request' }}
+      #     build-args: |
+      #       IMAGE_NAME=docker.io/nvidia/cuda:${{ steps.prep.outputs.version }}-devel-ubi8
+      #       TARGETARCH=amd64
+      #     tags: ${{ steps.prep.outputs.tags }}-devel-ubi8-python311,${{ steps.prep.outputs.ghcr_image }}:latest
+      #     labels: org.opencontainers.image.version=${{ steps.prep.outputs.version }}-devel-ubi8
diff --git a/.github/workflows/build-udi-cuda.yaml b/.github/workflows/build-udi-cuda.yaml
diff --git a/containers/python/ubi8/3.11/Dockerfile b/containers/python/ubi8/3.11/Dockerfile
@@ -0,0 +1,23 @@
+# syntax=docker/dockerfile:1.3-labs
+ARG IMAGE_NAME=ghcr.io/redhat-na-ssa/udi-cuda:11.8.0-cudnn8-devel-ubi8
+FROM ${IMAGE_NAME}
+
+# cherry picked from below
+# https://github.com/devfile/developer-images/blob/main/base/ubi8/Dockerfile
+
+# labels for container catalog
+LABEL summary="Python 3.11 devfile base developer image"
+LABEL description="Python 3.11 image with base developers tools"
+LABEL io.k8s.display-name="python-3.11-devfile-developer-base"
+LABEL io.openshift.expose-services=""
+
+USER 0
+
+# install: python
+RUN yum install -y python311 && \
+    alternatives --set python /usr/bin/python3.11 && \
+    ln -sf /usr/bin/pip3.11 /usr/bin/pip && \
+    yum clean all && \
+    rm -rf /var/cache/yum/*
+
+USER 1001
diff --git a/containers/python/ubi8/3.9/Dockerfile b/containers/python/ubi8/3.9/Dockerfile
@@ -0,0 +1,23 @@
+# syntax=docker/dockerfile:1.3-labs
+ARG IMAGE_NAME=ghcr.io/redhat-na-ssa/udi-cuda:11.8.0-cudnn8-devel-ubi8
+FROM ${IMAGE_NAME}
+
+# cherry picked from below
+# https://github.com/devfile/developer-images/blob/main/base/ubi8/Dockerfile
+
+# labels for container catalog
+LABEL summary="Python 3.9 devfile base developer image"
+LABEL description="Python 3.9 image with base developers tools"
+LABEL io.k8s.display-name="python-3.9-devfile-developer-base"
+LABEL io.openshift.expose-services=""
+
+USER 0
+
+# install: python
+RUN yum install -y python39 && \
+    alternatives --set python /usr/bin/python3.9 && \
+    ln -sf /usr/bin/pip3.9 /usr/bin/pip && \
+    yum clean all && \
+    rm -rf /var/cache/yum/*
+
+USER 1001