Skip to content

Commit 320cb31

Browse files
committed
Fix docker-compose agent image
Signed-off-by: Brad Davidson <[email protected]>
1 parent 61d715d commit 320cb31

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

e2e/cluster/local/docker-compose.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ services:
2828
- server
2929
container_name: k3s-agent-1
3030
image: "e2e/cluster/local/k3s"
31+
build:
32+
context: ./images/k3s/.
33+
args:
34+
- ARCH=${ARCH}
3135
command: agent --server https://k3s-server-1:6443
3236
environment:
3337
- K3S_TOKEN=e2e

e2e/cluster/local/images/k3s/Dockerfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ RUN set -x \
1111
&& if [ "${ARCH?required}" != "amd64" ]; then \
1212
K3S_SUFFIX="-${ARCH}"; \
1313
fi \
14-
&& curl -fsSL "https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s${K3S_SUFFIX}" > /bin/k3s \
14+
&& curl -fsSL "https://github.com/k3s-io/k3s/releases/download/${K3S_VERSION}/k3s${K3S_SUFFIX}" > /bin/k3s \
1515
&& chmod +x /bin/k3s \
1616
&& ln -s /bin/k3s /bin/kubectl \
1717
&& ln -s /bin/k3s /bin/ctr \
1818
&& k3s --version
1919

2020
COPY scratch/*-${ARCH}.tar /var/lib/rancher/k3s/agent/images/
21-
#ADD https://github.com/rancher/k3s/releases/download/${K3S_VERSION}/k3s-airgap-images-${ARCH}.tar /var/lib/rancher/k3s/agent/images/
2221

2322
VOLUME /var/lib/cni
2423
VOLUME /var/lib/kubelet

0 commit comments

Comments
 (0)