Add missing build attributes to base image

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Dec 7, 2023 · af05f70 · af05f70
1 parent 74cdcc2
commit af05f70
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/.github/workflows/reusable-build-base-image.yaml b/.github/workflows/reusable-build-base-image.yaml
@@ -90,5 +90,5 @@ jobs:
  if: steps.changed-files.outputs.nvidia_any_changed == 'true'
  run: |
  export IMAGE=$(FAMILY=${{ inputs.family }} FLAVOR=${{ inputs.flavor }} FLAVOR_RELEASE="${{ inputs.flavor_release}}" MODEL=${{ inputs.model}} TARGETARCH=${{ inputs.arch }} REGISTRY_AND_ORG="quay.io/kairos" ./images/naming.sh container_artifact_base_name)
- docker build --platform=linux/arm64 --build-arg=FAMILY=${{ inputs.family }} --build-arg=FLAVOR=${{ inputs.flavor }} --build-arg=FLAVOR_RELEASE="${{ inputs.flavor_release}}" --build-arg=MODEL=${{ inputs.model}} -t $IMAGE -f ./images/Dockerfile.${{ inputs.family }} ./images
+ docker build --platform=linux/${{ inputs.arch }} --build-arg="FAMILY=${{ inputs.family }}" --build-arg="FLAVOR=${{ inputs.flavor }}" --build-arg="FLAVOR_RELEASE=${{ inputs.flavor_release }}" --build-arg="MODEL=${{ inputs.model }}" --build-arg="BASE_IMAGE=${{ inputs.base_image }}" -t $IMAGE -f ./images/Dockerfile.${{ inputs.family }} ./images
  docker push $IMAGE
diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine
@@ -2,6 +2,7 @@
 ###############################################################
 #### ARGS ####
 ###############################################################
+# WARNING: While some of the ARGs are not used in this file, they are used in the images/Dockerfile.kairos-* files
 ARG FAMILY=alpine
 ARG FLAVOR
 ARG FLAVOR_RELEASE

diff --git a/images/Dockerfile.debian b/images/Dockerfile.debian
@@ -2,6 +2,7 @@
 ###############################################################
 #### ARGS ####
 ###############################################################
+# WARNING: While some of the ARGs are not used in this file, they are used in the images/Dockerfile.kairos-* files
 ARG FAMILY=debian
 ARG FLAVOR
 ARG FLAVOR_RELEASE

diff --git a/images/Dockerfile.kairos-rhel b/images/Dockerfile.kairos-rhel
@@ -1,4 +1,7 @@
 # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=rhel
+###############################################################
+#### ARGS ####
+###############################################################
 ARG FAMILY=rhel
 ARG FLAVOR
 ARG FLAVOR_RELEASE

diff --git a/images/Dockerfile.opensuse b/images/Dockerfile.opensuse
@@ -2,6 +2,7 @@
 ###############################################################
 #### ARGS ####
 ###############################################################
+# WARNING: While some of the ARGs are not used in this file, they are used in the images/Dockerfile.kairos-* files
 ARG FAMILY=opensuse
 ARG FLAVOR
 ARG FLAVOR_RELEASE

diff --git a/images/Dockerfile.rhel b/images/Dockerfile.rhel
@@ -1,4 +1,8 @@
 # WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead
+###############################################################
+#### ARGS ####
+###############################################################
+# WARNING: While some of the ARGs are not used in this file, they are used in the images/Dockerfile.kairos-* files
 ARG FAMILY=rhel
 ARG FLAVOR
 ARG FLAVOR_RELEASE

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -2,6 +2,7 @@
 ###############################################################
 #### ARGS ####
 ###############################################################
+# WARNING: While some of the ARGs are not used in this file, they are used in the images/Dockerfile.kairos-* files
 ARG FAMILY=ubuntu
 # Currently supported flavors are:
 # - ubuntu