Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

better compatibility for all version of docker and docker-compose #253

Merged
merged 1 commit into from
Oct 25, 2023
Merged

better compatibility for all version of docker and docker-compose #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions e2e/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ services:
docker network connect kind $$(hostname) # self contain
docker network connect e2e_default sshpipertest-control-plane
kind export kubeconfig -n sshpipertest --internal
kind load docker-image -n sshpipertest e2e_piper-imageonly
kubectl wait --for=condition=ready pod -A --all --timeout=2m
kubectl wait --for=condition=ready pod -n kube-system --all --timeout=2m
kubectl delete -f /kubernetes/crd.yaml --force --ignore-not-found
kubectl delete -f /kubernetes/workload.yaml --force --ignore-not-found
set -e
kind load docker-image -n sshpipertest sshpiper-test-image
kubectl wait --for=delete pod --all --timeout=2m # ensure no leftover
kubectl apply -f /kubernetes/crd.yaml
kubectl apply -f /kubernetes/workload.yaml
Expand All @@ -83,6 +83,7 @@ services:
- SSHPIPERD_LOG_LEVEL=trace
- SSHPIPERD_E2E_TEST=1
- SSHPIPERD_DEBUG=${SSHPIPERD_DEBUG}
- DOCKER_API_VERSION=1.40
build:
context: ../
target: builder
Expand All @@ -108,7 +109,8 @@ services:
piper-imageonly:
environment:
- SSHPIPERD_LOG_LEVEL=trace
build: ../
build: ../
image: sshpiper-test-image

volumes:
shared:
Expand Down
2 changes: 1 addition & 1 deletion e2e/k8sworkload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
containers:
- name: sshpiper
imagePullPolicy: Never
image: e2e_piper-imageonly
image: sshpiper-test-image
ports:
- containerPort: 2222
env:
Expand Down
Loading