From 1df862aae8472f765828043d0ae1bea2953b61a0 Mon Sep 17 00:00:00 2001
From: Eino Rauhala <60004820+EinoHR@users.noreply.github.com>
Date: Wed, 26 Apr 2023 20:15:16 +0300
Subject: [PATCH] style!: change base-container to base-image (#49)

#34
---
 .github/workflows/build.yml | 4 ++--
 Containerfile               | 4 ++--
 README.md                   | 2 +-
 recipe.yml                  | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 70a776b..c3ae778 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
           echo "IMAGE_NAME=$(yq '.name' ./${{ matrix.recipe }})" >> $GITHUB_ENV
           echo "IMAGE_DESCRIPTION=$(yq '.description' ./${{ matrix.recipe }})" >> $GITHUB_ENV
           echo "FEDORA_MAJOR_VERSION=$(yq '.fedora-version' ./${{ matrix.recipe }})" >> $GITHUB_ENV
-          echo "BASE_CONTAINER_URL=$(yq '.base-container' ./${{ matrix.recipe }})" >> $GITHUB_ENV
+          echo "BASE_IMAGE_URL=$(yq '.base-image' ./${{ matrix.recipe }})" >> $GITHUB_ENV
 
       - name: Generate tags
         id: generate-tags
@@ -114,7 +114,7 @@ jobs:
             ${{ steps.generate-tags.outputs.alias_tags }}
           build-args: |
             FEDORA_MAJOR_VERSION=${{ env.FEDORA_MAJOR_VERSION }}
-            BASE_CONTAINER_URL=${{ env.BASE_CONTAINER_URL }}
+            BASE_IMAGE_URL=${{ env.BASE_IMAGE_URL }}
             RECIPE=${{ matrix.recipe }}
           labels: ${{ steps.meta.outputs.labels }}
           oci: false
diff --git a/Containerfile b/Containerfile
index 6ee9b8e..36af020 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,7 +1,7 @@
 ARG FEDORA_MAJOR_VERSION=37
-ARG BASE_CONTAINER_URL=ghcr.io/ublue-os/silverblue-main
+ARG BASE_IMAGE_URL=ghcr.io/ublue-os/silverblue-main
 
-FROM ${BASE_CONTAINER_URL}:${FEDORA_MAJOR_VERSION}
+FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 ARG RECIPE
 
 # copy over configuration files
diff --git a/README.md b/README.md
index 4a31797..daca912 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ Don't worry, it only requires some basic knowledge about using the terminal and
 
 The easiest way to start customizing is by looking at and modifying `recipe.yml`. It's documented using comments and should be pretty easy to understand.
 
-For the base-container field, you can use any other native container image. You will get all the features of that image, plus the ones added here! Check out the [uBlue images list](https://ublue.it/images/) to decide what to use!
+For the base-image field, you can use any other native container image. You will get all the features of that image, plus the ones added here! Check out the [uBlue images list](https://ublue.it/images/) to decide what to use!
 
 If you want to add custom configuration files, you can just add them in the `etc` directory. If you need to add other directories, you can look at the Containerfile to see how it's done. Writing to any directories under `/var` in Fedora Silverblue are not supported and will not work, as those are user-managed.
 
diff --git a/recipe.yml b/recipe.yml
index 28f084e..0ae7e08 100644
--- a/recipe.yml
+++ b/recipe.yml
@@ -5,9 +5,8 @@
 name: startingpoint
 
 # The native container image to build on top of
-# images.
 # Warning: Non-uBlue images might function unexpectly
-base-container: ghcr.io/ublue-os/silverblue-main
+base-image: ghcr.io/ublue-os/silverblue-main
 
 # What fedora version to use. Use an explicit version or `latest`.
 # If you use `latest`, you will be automatically updated