3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-08-03 16:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ensure k3s runs as pid 1 in docker

Browse source 
This fixes the k3s entrypoint script in the docker compose integration
tests to ensure k3s runs as pid 1. This is required when running k3s in
docker if the host is using cgroup2.
This commit is contained in:
Joe Kralicky 2024-05-23 17:51:06 -04:00
parent 8269a723ec
commit aa3b790601
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
integration/clusters/kubernetes/compose.yml
View file

@ -16,13 +16,13 @@ services:
done
' &
fi
k3s "$$@"
exec k3s "$$@"
- k3s
- agent
environment:
K3S_TOKEN: TOKEN
K3S_URL: https://k3s-server:6443
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
image: rancher/k3s:${K3S_TAG:-v1.30.0-k3s1}
networks:
main:
aliases:
@ -1003,7 +1003,7 @@ services:
END_OF_MANIFEST
kubectl apply -f /tmp/manifest.json
sleep 30
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
image: rancher/k3s:${K3S_TAG:-v1.30.0-k3s1}
networks:
main:
aliases:
@ -1038,7 +1038,7 @@ services:
done
' &
fi
k3s "$$@"
exec k3s "$$@"
- k3s
- server
- --disable
@ -1056,7 +1056,7 @@ services:
- CMD
- kubectl
- cluster-info
image: rancher/k3s:${K3S_TAG:-v1.21.14-k3s1}
image: rancher/k3s:${K3S_TAG:-v1.30.0-k3s1}
networks:
main:
aliases: