Add ed25519 key to work around ssh-rsa deprecation

ContainerSSH · Jul 19, 2023 · 361c4f9 · 361c4f9
1 parent 8e5b8c1
commit 361c4f9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 2 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -16,6 +16,9 @@ services:
       - type: bind
         source: ./testdata/ssh_host_rsa_key
         target: /var/secrets/ssh_host_rsa_key
+      - type: bind
+        source: ./testdata/ssh_host_ed25519_key
+        target: /var/secrets/ssh_host_ed25519_key
       - type: bind
         source: /var/run/docker.sock
         target: /var/run/docker.sock

diff --git a/testdata/0.3.0/config.yaml b/testdata/0.3.0/config.yaml
@@ -2,9 +2,10 @@
 ssh:
   hostkeys:
     - /var/secrets/ssh_host_rsa_key
+    - /var/secrets/ssh_host_ed25519_key
 auth:
   url: "http://authconfig:8080"
 configserver:
   url: "http://authconfig:8080/config"
 dockerrun:
-  host: unix:///var/run/docker.sock
+  host: unix:///var/run/docker.sock
diff --git a/testdata/0.3.1/config.yaml b/testdata/0.3.1/config.yaml
@@ -2,9 +2,10 @@
 ssh:
   hostkeys:
     - /var/secrets/ssh_host_rsa_key
+    - /var/secrets/ssh_host_ed25519_key
 auth:
   url: "http://authconfig:8080"
 configserver:
   url: "http://authconfig:8080/config"
 dockerrun:
-  host: unix:///var/run/docker.sock
+  host: unix:///var/run/docker.sock
diff --git a/testdata/ssh_host_ed25519_key b/testdata/ssh_host_ed25519_key
@@ -0,0 +1,7 @@
+-----BEGIN OPENSSH PRIVATE KEY-----
+b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
+QyNTUxOQAAACAy3fZMX0Ks7n/EZ8SkSuAYuawe2YaPXyLHf0YDEMz3OAAAAJA+OHoYPjh6
+GAAAAAtzc2gtZWQyNTUxOQAAACAy3fZMX0Ks7n/EZ8SkSuAYuawe2YaPXyLHf0YDEMz3OA
+AAAEDf+OUcqWuvEjW0Tp88tmODHRwQXYHqO5l5ADUaA6II9TLd9kxfQqzuf8RnxKRK4Bi5
+rB7Zho9fIsd/RgMQzPc4AAAADW5pa29zQHBob2VuaXg=
+-----END OPENSSH PRIVATE KEY-----
diff --git a/testdata/ssh_host_ed25519_key.pub b/testdata/ssh_host_ed25519_key.pub
@@ -0,0 +1 @@
+ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDLd9kxfQqzuf8RnxKRK4Bi5rB7Zho9fIsd/RgMQzPc4 nikos@phoenix
diff --git a/testdata/v0.4.0/config.yaml b/testdata/v0.4.0/config.yaml
@@ -2,6 +2,7 @@
 ssh:
   hostkeys:
     - /var/secrets/ssh_host_rsa_key
+    - /var/secrets/ssh_host_ed25519_key
 auth:
   url: "http://authconfig:8080"
 configserver:

diff --git a/testdata/v0.4.1/config.yaml b/testdata/v0.4.1/config.yaml
@@ -2,6 +2,7 @@
 ssh:
   hostkeys:
     - /var/secrets/ssh_host_rsa_key
+    - /var/secrets/ssh_host_ed25519_key
 auth:
   url: "http://authconfig:8080"
 configserver:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDLd9kxfQqzuf8RnxKRK4Bi5rB7Zho9fIsd/RgMQzPc4 nikos@phoenix