Skip to content

Commit f02c758

Browse files
committed
put linux files back as default
1 parent 39a7405 commit f02c758

File tree

4 files changed

+3
-3
lines changed

4 files changed

+3
-3
lines changed

.github/workflows/test-ssh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
export DOCKER_BUILDKIT=1
4848
export COMPOSE_DOCKER_CLI_BUILD=1
4949
cd ci/ssh
50-
docker compose -f linux_docker-compose.yaml up -d --build
50+
docker compose up -d --build
5151
5252
# retrieve id_rsa file for public key authentication
5353
mkdir ~/.ssh/
File renamed without changes.

ci/ssh/linux_docker-compose.yaml renamed to ci/ssh/docker-compose.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ services:
33
image: ipyparallel-sshd
44
build:
55
context: ../..
6-
dockerfile: ci/ssh/linux_Dockerfile
6+
dockerfile: ci/ssh/Dockerfile
77
ports:
88
- "2222:22"

ipyparallel/tests/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ def ssh_dir(request):
181181
if os.name == "nt":
182182
yaml_file = "win_docker-compose.yaml"
183183
else:
184-
yaml_file = "linux_docker-compose.yaml"
184+
yaml_file = "docker-compose.yaml"
185185

186186
try:
187187
out = check_output(

0 commit comments

Comments
 (0)