From 320cb31d6c72b08bd48afff37ecdabd2d31b7f83 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Wed, 25 Sep 2024 23:57:56 +0000
Subject: [PATCH] Fix docker-compose agent image
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
---
e2e/cluster/local/docker-compose.yaml | 4 ++++
e2e/cluster/local/images/k3s/Dockerfile | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/e2e/cluster/local/docker-compose.yaml b/e2e/cluster/local/docker-compose.yaml
index db429946..88df1b47 100644
--- a/e2e/cluster/local/docker-compose.yaml
+++ b/e2e/cluster/local/docker-compose.yaml
@@ -28,6 +28,10 @@ services:
- server
container_name: k3s-agent-1
image: "e2e/cluster/local/k3s"
+ build:
+ context: ./images/k3s/.
+ args:
+ - ARCH=${ARCH}
command: agent --server https://k3s-server-1:6443
environment:
- K3S_TOKEN=e2e
diff --git a/e2e/cluster/local/images/k3s/Dockerfile b/e2e/cluster/local/images/k3s/Dockerfile
index 350c4b1f..d6b45368 100644
--- a/e2e/cluster/local/images/k3s/Dockerfile
+++ b/e2e/cluster/local/images/k3s/Dockerfile
@@ -11,14 +11,13 @@ RUN set -x \
&& if [ "${ARCH?required}" != "amd64" ]; then \
K3S_SUFFIX="-${ARCH}"; \
fi \
- && curl -fsSL "https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s${K3S_SUFFIX}" > /bin/k3s \
+ && curl -fsSL "https://github.com/k3s-io/k3s/releases/download/${K3S_VERSION}/k3s${K3S_SUFFIX}" > /bin/k3s \
&& chmod +x /bin/k3s \
&& ln -s /bin/k3s /bin/kubectl \
&& ln -s /bin/k3s /bin/ctr \
&& k3s --version
COPY scratch/*-${ARCH}.tar /var/lib/rancher/k3s/agent/images/
-#ADD https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s-airgap-images-${ARCH}.tar /var/lib/rancher/k3s/agent/images/
VOLUME /var/lib/cni
VOLUME /var/lib/kubelet
--
GitLab