From 49975c3df427c6c9a974ba04b6a1696d9835318c Mon Sep 17 00:00:00 2001
From: Bram Kelchtermans <bramkel@gmail.com>
Date: Sat, 8 Jun 2024 13:46:14 +0200
Subject: [PATCH] chore: Update Dockerfile to remove unnecessary SSH server
 configuration

---
 Dockers/react-dev-server/Dockerfile    |  2 +-
 Dockers/react-dev-server/entrypoint.sh | 21 +++------------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/Dockers/react-dev-server/Dockerfile b/Dockers/react-dev-server/Dockerfile
index bf6d4ba..d82483a 100644
--- a/Dockers/react-dev-server/Dockerfile
+++ b/Dockers/react-dev-server/Dockerfile
@@ -8,7 +8,7 @@ WORKDIR /workspace
 RUN npm install -g pm2
 
 # Install git, openssh-client, and openssh-server
-RUN apt-get update && apt-get install -y git openssh-client openssh-server
+RUN apt-get update && apt-get install -y git openssh-client
 
 # Create a directory for the SSH keys
 RUN mkdir -p /root/.ssh
diff --git a/Dockers/react-dev-server/entrypoint.sh b/Dockers/react-dev-server/entrypoint.sh
index 62640d3..2c5b1c7 100644
--- a/Dockers/react-dev-server/entrypoint.sh
+++ b/Dockers/react-dev-server/entrypoint.sh
@@ -7,12 +7,6 @@ if [ -z "$REPO_URL" ]; then
     exit 1
 fi
 
-
-if [ -z "$SSH_PORT" ]; then
-    $SSH_PORT=22
-fi
-
-
 # Check if the SSH key exists
 if [ ! -f /root/.ssh/id_rsa ]; then
     echo "Error: SSH private key not found at /root/.ssh/id_rsa"
@@ -23,13 +17,13 @@ fi
 chmod 600 /root/.ssh/id_rsa
 
 # Extract the domain from the REPO_URL
-DOMAIN=$(echo $REPO_URL | awk -F'[@:]' '{print $2}')
+DOMAIN=$(echo $REPO_URL | awk -F'[@:]' '{print $3}')
 
 # Check if the repository directory already exists
 if [ ! -d "/workspace/.git" ]; then
     # Add the SSH configuration for the domain
-    echo "Host gitea.bramkelchtermans.be
-      HostName gitea.bramkelchtermans.be
+    echo "Host $DOMAIN
+      HostName $DOMAIN
       IdentityFile /root/.ssh/id_rsa
       StrictHostKeyChecking no
     " >> /root/.ssh/config
@@ -42,15 +36,6 @@ if [ -f /root/.ssh/hostkey.pub ]; then
     cat /root/.ssh/hostkey.pub >> /root/.ssh/authorized_keys
 fi
 
-# Configure SSH server
-echo "Port 2222" >> /etc/ssh/sshd_config
-echo 'AllowTcpForwarding yes' >> /etc/ssh/sshd_config
-echo 'AllowAgentForwarding yes' >> /etc/ssh/sshd_config
-echo 'PermitRootLogin yes' >> /etc/ssh/sshd_config
-
-# Start the SSH service
-service ssh start
-
 # Change to the repository directory
 cd /workspace