Finally finally fix fcos image build (#204)

Fix github url

Author: byrnedo

.github/workflows/build.yml

@@ -328,8 +328,8 @@ jobs:
         with:
           # Since we need the cargo workspace, we need to make the repo root the context
           context: ./images/fcos-skate
-          push: true
-          build-args: VERSION=${{ github.ref_name }}
+          push: false
+          #build-args: VERSION=${{ github.ref_name }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           file: ./images/fcos-skate/ContainerFile

hack/install-skate.sh

@@ -7,7 +7,13 @@ if [[ -n "${DEBUG:-}" ]]; then
 fi
 
 INSTALL_PATH=${INSTALL_PATH:-/usr/local/bin}
-VERSION=${VERSION:-latest}
+VERSION=${VERSION:-}
+
+if [[ -z "$VERSION" ]]; then
+  URL_SUFFIX="latest"
+else
+  URL_SUFFIX="tags/$VERSION"
+fi
 
 os=$(uname -o)
 arch=$(uname -m)
@@ -43,7 +49,7 @@ fi
 
 get_install_alternatives(){
   # shellcheck disable=SC2068
-  output=$(curl ${EXTRA_ARGS[@]+"${EXTRA_ARGS[@]}"} -f --retry 5 --retry-max-time 30 --retry-all-errors --silent "https://api.github.com/repos/skateco/skate/releases/${VERSION}")
+  output=$(curl ${EXTRA_ARGS[@]+"${EXTRA_ARGS[@]}"} -f --retry 5 --retry-max-time 30 --retry-all-errors --silent "https://api.github.com/repos/skateco/skate/releases/${URL_SUFFIX}")
 
   echo "$output" \
     | grep "browser_download_url.*tar.gz" \

hack/install-skatelet.sh

@@ -7,7 +7,13 @@ if [[ -n "${DEBUG:-}" ]]; then
 fi
 
 INSTALL_PATH=${INSTALL_PATH:-/usr/local/bin}
-VERSION=${VERSION:-latest}
+VERSION=${VERSION:-}
+
+if [[ -z "$VERSION" ]]; then
+  URL_SUFFIX="latest"
+else
+  URL_SUFFIX="tags/$VERSION"
+fi
 
 os=$(uname -o)
 arch=$(uname -m)
@@ -43,7 +49,7 @@ fi
 
 get_install_alternatives(){
   # shellcheck disable=SC2068
-  output=$(curl ${EXTRA_ARGS[@]+"${EXTRA_ARGS[@]}"} -f --retry 5 --retry-max-time 30 --retry-all-errors --silent "https://api.github.com/repos/skateco/skate/releases/${VERSION}")
+  output=$(curl ${EXTRA_ARGS[@]+"${EXTRA_ARGS[@]}"} -f --retry 5 --retry-max-time 30 --retry-all-errors --silent "https://api.github.com/repos/skateco/skate/releases/${URL_SUFFIX}")
 
   echo "$output" \
     | grep "browser_download_url.*tar.gz" \
@@ -80,5 +86,5 @@ tar -xvf skatelet.tar.gz
 sudo mv skatelet "${INSTALL_PATH}/skatelet"
 sudo chmod +x "${INSTALL_PATH}/skatelet"
 
-echo "Skate installed successfully in ${INSTALL_PATH}"
+echo "Skatelet installed successfully in ${INSTALL_PATH}"
 

images/fcos-skate/ContainerFile

@@ -2,13 +2,12 @@ FROM quay.io/fedora/fedora-coreos:stable
 
 ARG VERSION
 
-RUN echo "Running rpm install" && \
-    dnf install -y \
+RUN dnf install -y \
     rsyslog  \
     wget \
     keepalived && \
     # set registry short name mode to permissive
     sed -i 's|^[\#]\?short-name-mode\s\?=.*|short-name-mode=\"permissive\"|g' /etc/containers/registries.conf && \
     wget -O /tmp/install-skatelet.sh https://raw.githubusercontent.com/skateco/skate/refs/heads/main/hack/install-skatelet.sh && \
-    INSTALL_PATH=/usr/sbin VERSION=$VERSION bash /tmp/install-skatelet.sh && \
+    DEBUG=1 INSTALL_PATH=/usr/sbin VERSION=$VERSION bash /tmp/install-skatelet.sh && \
     ostree container commit