feat(docker): Rename images to new defaults

- ORT main image is now called ort alone. Is based on previous
  ort-extended image.
- A new image called ort-minimal is created based on original ort image.
- Language component images now have named version with hash addition
  to chek if contents of the image changed without changing core
  language.

Signed-off-by: Helio Chissini de Castro <[email protected]>

.github/actions/ortdocker/action.yml

@@ -54,6 +54,7 @@ runs:
         INPUT_TOKEN: ${{ inputs.token }}
         INPUT_NAME: ${{ inputs.name }}
         INPUT_VERSION: ${{ inputs.version }}
+        BUILD_ARGS: ${{ inputs.build-args }}
       run: |
         pip install -q -U pip requests
 

.github/actions/ortdocker/check_image.py

@@ -15,6 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
+import hashlib
 import os
 
 import requests
@@ -26,7 +27,11 @@
 token = os.getenv("INPUT_TOKEN")
 org = os.getenv("GITHUB_REPOSITORY_OWNER")
 name = os.getenv("INPUT_NAME")
-version = os.getenv("INPUT_VERSION")
+base_version = os.getenv("INPUT_VERSION")
+unique_id = hashlib.sha256(os.getenv("BUILD_ARGS").encode()).hexdigest()
+
+# We base the version on the base_version and the unique_id
+version = f"{base_version}-{unique_id[:8]}"
 
 url = f"https://api.github.com/orgs/{org}/packages/container/ort%2F{name}/versions"
 
@@ -47,4 +52,4 @@
     if version in versions:
         print("found")
     else:
-        print("none")
+        print(version)

.github/workflows/docker-ort-runtime.yml → .github/workflows/docker-ort-minimal.yml

@@ -15,7 +15,7 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Docker runtime image
+name: ORT Minimal Image
 
 on:
   workflow_dispatch:
@@ -25,7 +25,7 @@ on:
     paths:
       - '.versions'
       - 'Dockerfile'
-      - '.github/workflows/docker-ort-runtime.yml'
+      - '.github/workflows/docker-ort-minimal.yml'
   push:
     tags:
       - '*'
@@ -213,6 +213,7 @@ jobs:
         with:
           context: .
           target: run
+          file: Dockerfile-minimal
           push: true
           load: false
           build-args: |

.github/workflows/docker-ort-runtime-ext.yml → .github/workflows/docker-ort.yml

@@ -15,13 +15,13 @@
 # SPDX-License-Identifier: Apache-2.0
 # License-Filename: LICENSE
 
-name: Docker extended runtime image
+name: ORT Image
 
 on:
   workflow_dispatch:
   workflow_run:
     workflows:
-      - 'Docker runtime image'
+      - 'ORT Minimal Image'
     types:
       - completed
 
@@ -186,14 +186,13 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: Dockerfile-extended
           push: true
           load: false
           tags: |
             ${{ steps.meta-ort.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-contexts: |
-            ort=docker-image://${{ env.REGISTRY }}/${{ github.repository_owner }}/ort:${{ env.ORT_VERSION }}
+            ort-minimal=docker-image://${{ env.REGISTRY }}/${{ github.repository_owner }}/ort-minimal:${{ env.ORT_VERSION }}
             android=docker-image://${{ env.REGISTRY }}/${{ github.repository }}/android:latest
             swift=docker-image://${{ env.REGISTRY }}/${{ github.repository }}/swift:latest
             scala=docker-image://${{ env.REGISTRY }}/${{ github.repository }}/scala:latest