Remove redundant registry retrieval step and use environment variable directly in Docker workflow

Signed-off-by: Stephen Simpson <ssimpson89@users.noreply.github.com>

.gitea/workflows/docker-image-linux.yml

@@ -10,14 +10,11 @@ on:
   workflow_dispatch:
 
 env:
-  REGISTRY: gitea.sjs.io
   IMAGE_NAME: rocky-dev
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    container:
-      image: gitea/runner-images:ubuntu-latest
 
     permissions:
       contents: read
@@ -36,7 +33,7 @@ jobs:
       - name: Log in to registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ vars.REGISTRY }}
           username: ${{ vars.USERNAME }}
           password: ${{ secrets.PASS }}
 
@@ -44,7 +41,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ vars.USERNAME }}/${{ env.IMAGE_NAME }}
+          images: ${{ vars.REGISTRY }}/${{ vars.USERNAME }}/${{ env.IMAGE_NAME }}
           tags: |
             # Only tag with version and latest on tag push
             type=semver,pattern={{version}},enable=${{ startsWith(github.ref, 'refs/tags/') }}

Dockerfile

@@ -1,7 +1,7 @@
 FROM rockylinux/rockylinux:9
 
-RUN dnf update -y
+RUN dnf install -y epel-release && \
-RUN dnf install -y \
+    dnf install -y \
     iputils \
     iproute \
     iperf3 \
@@ -14,12 +14,9 @@ RUN dnf install -y \
     createrepo_c \
     golang \
     python3-pip \
-    curl \
     git \
     tree \
-    htop \
     tmux \
-    screen \
     nano \
     unzip \
     tar \
@@ -33,15 +30,18 @@ RUN dnf install -y \
     lsof \
     openssh-clients \
     nodejs \
-    rsync \
+    npm && \
-    npm
+    dnf group install -y "Development Tools" && \
-RUN dnf group install -y "Development Tools" && \
+    dnf clean all
-    dnf clean all && \
+
-    case "$(uname -m)" in \
+RUN set -e && \
-      x86_64)  wget "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64" -O /usr/local/bin/yq ;; \
+    ARCH=$(uname -m) && \
-      aarch64) wget "https://github.com/mikefarah/yq/releases/latest/download/yq_linux_arm64" -O /usr/local/bin/yq ;; \
+    case "$ARCH" in \
+      x86_64)  YQ_ARCH="amd64" ;; \
+      aarch64) YQ_ARCH="arm64" ;; \
       *)       echo "Unsupported architecture: $ARCH" && exit 1 ;; \
     esac && \
+    wget "https://github.com/mikefarah/yq/releases/download/v4.35.1/yq_linux_${YQ_ARCH}" -O /usr/local/bin/yq && \
     chmod +x /usr/local/bin/yq && \
     echo "alias ll='ls -l --color=auto'" >> /root/.bashrc && \
     echo "alias ls='ls --color=auto'" >> /root/.bashrc