inherit secrets for nvidia-arm-core pipeline

plus hadolint Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Nov 30, 2023 · c84fdcf · c84fdcf
1 parent 438cb64
commit c84fdcf
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 10 deletions.
diff --git a/.github/workflows/image-arm.yaml b/.github/workflows/image-arm.yaml
@@ -125,6 +125,7 @@ jobs:
   nvidia-arm-core:
     needs: build-nvidia-base
     uses: ./.github/workflows/reusable-docker-arm-build.yaml
+    secrets: inherit
     with:
       flavor: ubuntu
       flavor_release: "20.04"

diff --git a/images/Dockerfile.kairos-alpine b/images/Dockerfile.kairos-alpine
@@ -154,8 +154,8 @@ FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSI
 FROM all AS base-kairos
 
 # Symlinks to make elemental installer work
-RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
-RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
+RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
+RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
 
 # Originally done in Earthly
 COPY --from=framework / /

diff --git a/images/Dockerfile.kairos-debian b/images/Dockerfile.kairos-debian
@@ -159,8 +159,8 @@ FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSI
 FROM all AS base-kairos
 
 # Symlinks to make elemental installer work
-RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
-RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
+RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
+RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
 
 # Originally done in Earthly
 COPY --from=framework / /

diff --git a/images/Dockerfile.kairos-opensuse b/images/Dockerfile.kairos-opensuse
@@ -163,8 +163,8 @@ FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSI
 FROM all AS base-kairos
 
 # Symlinks to make elemental installer work
-RUN orig=/usr/sbin/grub-install dest=/usr/sbin/grub2-install [ -e origin_file ] && [ ! -e destination_file ] && ln -s orig dest
-RUN orig=/usr/bin/grub-editenv dest=/usr/sbin/grub2-editenv [ -e origin_file ] && [ ! -e destination_file ] && ln -s orig dest
+RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
+RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
 
 # Originally done in Earthly
 COPY --from=framework / /

diff --git a/images/Dockerfile.kairos-rhel b/images/Dockerfile.kairos-rhel
@@ -87,8 +87,8 @@ FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSI
 FROM all AS base-kairos
 
 # Symlinks to make elemental installer work
-RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
-RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
+RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
+RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
 
 # Originally done in Earthly
 COPY --from=framework / /

diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu
@@ -249,8 +249,8 @@ FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSI
 FROM all AS base-kairos
 
 # Symlinks to make elemental installer work
-RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
-RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST
+RUN ORIG=/usr/sbin/grub-install; DEST=/usr/sbin/grub2-install; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
+RUN ORIG=/usr/bin/grub-editenv; DEST=/usr/sbin/grub2-editenv; [ -e $ORIG ] && [ ! -e $DEST ] && ln -s $ORIG $DEST || true
 
 # Originally done in Earthly
 COPY --from=framework / /