docker: FROM_IMAGE -> base

Author: enwask

.github/workflows/docker-bases.yml

@@ -84,7 +84,7 @@ jobs:
           push: true
           build-args: |
             gcc=${{ matrix.gcc }}
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: "devitocodes/bases:cpu-gcc${{ matrix.gcc }}${{ matrix.disable-gil && '-nogil' || '' }}"
 
 
@@ -138,7 +138,7 @@ jobs:
           target: "icx"
           build-args: |
             arch=icx
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: "devitocodes/bases:cpu-icx${{ matrix.disable-gil && '-nogil' || '' }}"
 
       - name: SYCL CPU image
@@ -150,7 +150,7 @@ jobs:
           target: "cpu-sycl"
           build-args: |
             arch=cpu-sycl
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: "devitocodes/bases:cpu-sycl${{ matrix.disable-gil && '-nogil' || '' }}"
 
       - name: SYCL GPU image
@@ -162,7 +162,7 @@ jobs:
           target: "gpu-sycl"
           build-args: |
             arch=gpu-sycl
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: "devitocodes/bases:gpu-sycl${{ matrix.disable-gil && '-nogil' || '' }}"
 
   #######################################################
@@ -215,7 +215,7 @@ jobs:
           target: "nvc"
           build-args: |
             arch=nvc
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           # Label (not tag) with runner name for traceability without changing image tags
           labels: builder-runner=${{ runner.name }}
           tags: "devitocodes/bases:nvidia-nvc${{ matrix.disable-gil && '-nogil' || '' }}"
@@ -229,7 +229,7 @@ jobs:
           target: "nvcc"
           build-args: |
             arch=nvcc
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           labels: builder-runner=${{ runner.name }}
           tags: "devitocodes/bases:nvidia-nvcc${{ matrix.disable-gil && '-nogil' || '' }}"
 
@@ -242,7 +242,7 @@ jobs:
           target: "nvc-host"
           build-args: |
             arch=nvc-host
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           labels: builder-runner=${{ runner.name }}
           tags: "devitocodes/bases:cpu-nvc${{ matrix.disable-gil && '-nogil' || '' }}"
 
@@ -298,7 +298,7 @@ jobs:
             ROCM_VERSION=5.5.1
             UCX_BRANCH=v1.13.1
             OMPI_BRANCH=v4.1.4
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: devitocodes/bases:amd${{ matrix.disable-gil && '-nogil' || '' }}
 
       - name: AMD HIP image
@@ -310,5 +310,5 @@ jobs:
           target: "hip"
           build-args: |
             ROCM_VERSION=6.3.4
-            ${{ matrix.disable-gil && 'FROM_IMAGE=ubuntu-nogil' || '' }}
+            ${{ matrix.disable-gil && 'base=ubuntu-nogil' || '' }}
           tags: devitocodes/bases:amd-hip${{ matrix.disable-gil && '-nogil' || '' }}

docker/Dockerfile.amd

@@ -4,10 +4,10 @@
 ##############################################################
 
 ARG ROCM_VERSION=6.3.2
-ARG FROM_IMAGE=ubuntu:22.04
+ARG base=ubuntu:22.04
 
-# FROM_IMAGE may be specified with the nogil base to provide a Python build
-FROM $FROM_IMAGE AS ubuntu-base
+# Base may be specified with the nogil base to provide a Python build
+FROM $base AS ubuntu-base
 FROM rocm/dev-ubuntu-22.04:${ROCM_VERSION}-complete AS sdk-base
 
 ENV DEBIAN_FRONTEND=noninteractive

docker/Dockerfile.cpu

@@ -5,10 +5,10 @@
 ##############################################################
 
 # Base image is either ubuntu or the nogil base
-ARG FROM_IMAGE=ubuntu:22.04
+ARG base=ubuntu:22.04
 ARG gcc=""
 
-FROM $FROM_IMAGE AS base
+FROM $base AS base
 
 ENV DEBIAN_FRONTEND=noninteractive
 

docker/Dockerfile.intel

@@ -4,8 +4,8 @@
 ##############################################################
 
 # Base image
-ARG FROM_IMAGE=ubuntu:22.04
-FROM $FROM_IMAGE as base
+ARG base=ubuntu:22.04
+FROM $base as base
 
 ENV DEBIAN_FRONTEND noninteractive
 

docker/Dockerfile.nogil

@@ -2,9 +2,9 @@
 # Builds a base image with free-threaded Python 3.13
 ##############################################################
 
-ARG FROM_IMAGE=ubuntu:22.04
+ARG base=ubuntu:22.04
 
-FROM $FROM_IMAGE AS builder
+FROM $base AS builder
 
 ENV DEBIAN_FRONTEND=noninteractive
 

docker/Dockerfile.nvidia

@@ -7,8 +7,8 @@ ARG arch="nvc"
 ########################################################################
 # Build base image with apt setup and common env
 ########################################################################
-ARG FROM_IMAGE=ubuntu:22.04
-FROM $FROM_IMAGE AS sdk-base
+ARG base=ubuntu:22.04
+FROM $base AS sdk-base
 
 SHELL ["/bin/bash", "-c"]