Prefer "main" to "base" image

georust · Apr 4, 2024 · a3bea3a · a3bea3a
1 parent 9edc06a
commit a3bea3a
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/.github/workflows/imagebuild.yml b/.github/workflows/imagebuild.yml
@@ -11,11 +11,11 @@ on:
 
 env:
   LIBPROJ_VERSION: 9.4.0
-  BASE_IMAGE_NAME: libproj-builder
+  MAIN_IMAGE_NAME: libproj-builder
 
 jobs:
-  build_base_image:
-    name: Build the base image for geo and proj
+  build_main_image:
+    name: Build the main image for geo and proj
     runs-on: ubuntu-latest
 
     strategy:
@@ -45,34 +45,34 @@ jobs:
         docker buildx use mybuilder
         docker buildx inspect --bootstrap
 
-    - name: Build and export base image to Docker
+    - name: Build and export main image to Docker
       uses: docker/build-push-action@v5
       with:
-        file: ./dockerfiles/${{ env.BASE_IMAGE_NAME }}
+        file: ./dockerfiles/${{ env.MAIN_IMAGE_NAME }}
         push: false
         load: true
         platforms: linux/amd64
-        tags: ghcr.io/${{ github.repository_owner }}/${{ env.BASE_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        tags: ghcr.io/${{ github.repository_owner }}/${{ env.MAIN_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
         build-args: |
               RUST_VERSION=${{ matrix.rust_version }}
               PROJ_VERSION=${{ env.LIBPROJ_VERSION }}
 
-    - name: Push tested base image
+    - name: Push tested main image
       uses: docker/build-push-action@v5
       with:
-        file: ./dockerfiles/${{ env.BASE_IMAGE_NAME }}
+        file: ./dockerfiles/${{ env.MAIN_IMAGE_NAME }}
         push: true
         load: false
         # platforms: linux/amd64,linux/arm64
-        tags: ghcr.io/${{ github.repository_owner }}/${{ env.BASE_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
-        outputs: type=docker,dest=/tmp/${{ env.BASE_IMAGE_NAME }}-proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}.tar
+        tags: ghcr.io/${{ github.repository_owner }}/${{ env.MAIN_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        outputs: type=docker,dest=/tmp/${{ env.MAIN_IMAGE_NAME }}-proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}.tar
         build-args: |
               RUST_VERSION=${{ matrix.rust_version }}
               PROJ_VERSION=${{ env.LIBPROJ_VERSION }}
 
   build_dependent_images:
     name: Build dependent images for geo and proj
-    needs: build_base_image
+    needs: build_main_image
     runs-on: ubuntu-latest
 
     strategy: