Merge pull request #45 from patrickdk77/main

Fix install coreutils, remove dnf cache files, fix working on non-amd64

Author: kodermax

.github/workflows/push.yml

@@ -11,7 +11,10 @@ name: Publish Docker image
 
 on:
   push:
-    branches: [main]
+    branches:
+      - 'main'
+    tags:
+      - '*'
 
 jobs:
   push_to_registry:
@@ -21,6 +24,12 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v4
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Log in to Docker Hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
         with:
@@ -32,12 +41,18 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: kodermax/kubectl-aws-eks
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=ref,event=branch
 
       - name: Build and push Docker image
         uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
         with:
           context: .
           file: ./Dockerfile
           push: true
-          tags: kodermax/kubectl-aws-eks:latest
+          tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64,linux/arm64

Dockerfile

@@ -1,14 +1,18 @@
 FROM amazon/aws-cli:latest
+ARG TARGETARCH
+ARG JQ_VERSION=1.6
+ARG IAM_VERSION=0.6.12
 
 # Install system packages and jq first
-RUN yum update -y && \
-    yum install -y coreutils && \
-    curl -sL -o /usr/bin/jq https://github.com/jqlang/jq/releases/download/jq-1.6/jq-linux64 && \
+RUN dnf update -y && \
+    dnf install --allowerasing -y coreutils && \
+    rm /var/cache/dnf/*.solv* && \
+    curl -sL -o /usr/bin/jq https://github.com/jqlang/jq/releases/download/jq-${JQ_VERSION}/jq-linux-${TARGETARCH} && \
     chmod +x /usr/bin/jq
 
 # Install kubectl and aws-iam-authenticator
-RUN curl -sL -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
-    curl -sL -o /usr/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v0.6.12/aws-iam-authenticator_0.6.12_linux_amd64 && \
+RUN curl -sL -o /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/${TARGETARCH}/kubectl && \
+    curl -sL -o /usr/bin/aws-iam-authenticator https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v${IAM_VERSION}/aws-iam-authenticator_${IAM_VERSION}_linux_${TARGETARCH} && \
     chmod +x /usr/bin/aws-iam-authenticator && \
     chmod +x /usr/bin/kubectl