From d92cb1bdfbdb92f861532384383cda48e664d07c Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Tue, 30 Apr 2024 17:35:40 -0500 Subject: [PATCH] feat: deprecated lagoon_cli.key and remove from Node 22 --- images/node-cli/22.Dockerfile | 3 +-- images/node-cli/ssh_config | 1 + images/php-cli/ssh_config | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/node-cli/22.Dockerfile b/images/node-cli/22.Dockerfile index 546420f66..4cda97717 100644 --- a/images/node-cli/22.Dockerfile +++ b/images/node-cli/22.Dockerfile @@ -41,8 +41,7 @@ RUN fix-permissions /etc/my.cnf.d/ # SSH Key and Agent Setup COPY ssh_config /etc/ssh/ssh_config -COPY id_ed25519_lagoon_cli.key /home/.ssh/lagoon_cli.key -RUN chmod 400 /home/.ssh/lagoon_cli.key +RUN sed -i '/# Deprecated: lagoon_cli.key/,+2d' /etc/ssh/ssh_config ENV SSH_AUTH_SOCK=/tmp/ssh-agent ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"] diff --git a/images/node-cli/ssh_config b/images/node-cli/ssh_config index 6a0977ce6..e0b733194 100644 --- a/images/node-cli/ssh_config +++ b/images/node-cli/ssh_config @@ -5,5 +5,6 @@ Host * ServerAliveInterval 60 ServerAliveCountMax 1440 +# Deprecated: lagoon_cli.key Match localuser root IdentityFile /home/.ssh/lagoon_cli.key diff --git a/images/php-cli/ssh_config b/images/php-cli/ssh_config index 6a0977ce6..e0b733194 100644 --- a/images/php-cli/ssh_config +++ b/images/php-cli/ssh_config @@ -5,5 +5,6 @@ Host * ServerAliveInterval 60 ServerAliveCountMax 1440 +# Deprecated: lagoon_cli.key Match localuser root IdentityFile /home/.ssh/lagoon_cli.key