Lint

kairos-io · Nov 18, 2023 · cb90777 · cb90777
1 parent ec9d810
commit cb90777
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine
@@ -177,7 +177,6 @@ ARG OS_NAME=kairos-${VARIANT}-${FLAVOR}-${FLAVOR_RELEASE}
 ENV KAIROS_VERSION="${VERSION}${K3S_VERSION:+-k3s$K3S_VERSION}"
 ENV OS_VERSION=${KAIROS_VERSION}
 ENV OS_LABEL=${KAIROS_VERSION}
-RUN echo $(naming.sh container_artifact_label)
 RUN OS_LABEL=$(naming.sh container_artifact_label) \
     OS_REPO=$(naming.sh container_artifact_repo) \
     ARTIFACT=$(naming.sh bootable_artifact_name) \
@@ -194,11 +193,12 @@ FROM all AS core
 FROM all AS standard
 ARG K3S_VERSION
 RUN luet install -y system/provider-kairos
-RUN luet install -y $(echo k8s/k3s-systemd@${K3S_VERSION}) utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
+RUN luet install -y k8s/k3s-systemd@${K3S_VERSION} utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
 RUN luet database get-all-installed --output /etc/kairos/versions.yaml
 
 FROM ${VARIANT} AS final
 
+SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 RUN kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"
 # Regenerate initrd if necessary
 RUN if [ -f "/usr/bin/dracut" ]; then \

diff --git a/images/Dockerfile.opensuse b/images/Dockerfile.opensuse
@@ -208,11 +208,12 @@ FROM all AS core
 FROM all AS standard
 ARG K3S_VERSION
 RUN luet install -y system/provider-kairos
-RUN luet install -y $(echo k8s/k3s-systemd@${K3S_VERSION}) utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
+RUN luet install -y k8s/k3s-systemd@${K3S_VERSION} utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
 RUN luet database get-all-installed --output /etc/kairos/versions.yaml
 
 FROM ${VARIANT} AS final
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # TODO what about NOT building initrd for the UKI?
 # TODO what about caches?
 RUN kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"

diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu
@@ -306,7 +306,7 @@ FROM all AS core
 FROM all AS standard
 ARG K3S_VERSION
 RUN luet install -y system/provider-kairos
-RUN luet install -y $(echo k8s/k3s-systemd@${K3S_VERSION}) utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
+RUN luet install -y k8s/k3s-systemd@${K3S_VERSION} utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip
 RUN luet database get-all-installed --output /etc/kairos/versions.yaml
 
 FROM ${VARIANT} AS final
@@ -315,6 +315,7 @@ RUN find /usr/lib/firmware -type f -execdir zstd --rm -9 {} \+
 # compress modules
 RUN find /usr/lib/modules -type f -name "*.ko" -execdir zstd --rm -9 {} \+
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 # TODO what about NOT building initrd for the UKI?
 # TODO what about caches?
 RUN kernel=$(ls /lib/modules | head -n1) && depmod -a "${kernel}"