Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
system-upgrade-controller
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
rancher
system-upgrade-controller
Commits
320cb31d
Commit
320cb31d
authored
8 months ago
by
Brad Davidson
Committed by
Brad Davidson
8 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix docker-compose agent image
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
61d715d0
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
e2e/cluster/local/docker-compose.yaml
+4
-0
4 additions, 0 deletions
e2e/cluster/local/docker-compose.yaml
e2e/cluster/local/images/k3s/Dockerfile
+1
-2
1 addition, 2 deletions
e2e/cluster/local/images/k3s/Dockerfile
with
5 additions
and
2 deletions
e2e/cluster/local/docker-compose.yaml
+
4
−
0
View file @
320cb31d
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
e2e/cluster/local/images/k3s/Dockerfile
+
1
−
2
View file @
320cb31d
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment