From d334a45df7431b7509fa1ce5e4a1591fd8736d45 Mon Sep 17 00:00:00 2001
From: Dragan Filipovic <info@frontenddot.com>
Date: Fri, 30 Dec 2022 10:29:20 +0100
Subject: [PATCH] fix paths

---
 .github/workflows/e2e.yml | 29 ++++++++++++++++++-----------
 test/Dockerfile           |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index d0e0bbf..0aa67c1 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -6,7 +6,6 @@ on:
       - feature/add-tests
 
 env:
-  TEST_PROJECT: ./test_project
   TEST_HOST_DOCKER: ./test
   TEST_USER: kaja
 
@@ -18,16 +17,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
+      - name: Clean up old test files
+        run: |
+          docker stop ssh-host-container || true && docker rm ssh-host-container || true
+
       - name: 1. Create ssh keys
         run: |
+          echo $HOME
+          ls -la $HOME
           ssh-keygen -m PEM -t rsa -b 4096 -f "$HOME/.ssh/id_rsa" -N ""
-          EXAMPLE_SSH_PRIVATE_KEY=$(cat $HOME/.ssh/id_rsa)
-          echo "EXAMPLE_SSH_PRIVATE_KEY=$EXAMPLE_SSH_PRIVATE_KEY<<EOF" >> $GITHUB_ENV
-          ssh-add "$HOME/.ssh/id_rsa"
-          ssh-add -l
+          # ssh-add "$HOME/.ssh/id_rsa"
+          # ssh-add -l
+          echo "EXAMPLE_SSH_PRIVATE_KEY<<EOF" >> $GITHUB_ENV
+          cat $HOME/.ssh/id_rsa >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
 
       - name: Build Host Server Image
-        working-directory: $TEST_HOST_DOCKER
+        working-directory: ${{ env.TEST_HOST_DOCKER }}
         run: |
           docker build \
             -t ssh-host-image . \
@@ -35,7 +41,7 @@ jobs:
             --build-arg ssh_user=$TEST_USER \
 
       - name: Start Host Server Container
-        working-directory: $TEST_HOST_DOCKER
+        working-directory: ${{ env.TEST_HOST_DOCKER }}
         run: |
           docker run --name ssh-host-container -d ssh-host-image
 
@@ -48,7 +54,8 @@ jobs:
 
       - name: Create project file
         run: |
-          mkdir $TEST_PROJECT && cd $TEST_PROJECT
+          mkdir test_project
+          cd test_project
           touch index.html
           date +"%Y-%m-%d %H:%M:%S,%3N" >> index.html
           cat index.html
@@ -56,10 +63,10 @@ jobs:
       - name: e2e Test ssh-deploy action
         uses: easingthemes/ssh-deploy@main
         env:
-          SSH_PRIVATE_KEY: $EXAMPLE_SSH_PRIVATE_KEY
+          SSH_PRIVATE_KEY: env.EXAMPLE_SSH_PRIVATE_KEY
           ARGS: "-rltgoDzvO"
-          SOURCE: "dist/"
-          REMOTE_HOST: $EXAMPLE_REMOTE_HOST
+          SOURCE: "test_project/"
+          REMOTE_HOST: env.EXAMPLE_REMOTE_HOST
           REMOTE_USER: $TEST_USER
           TARGET: "/var/www/html/"
           EXCLUDE: "/dist/, /node_modules/"
diff --git a/test/Dockerfile b/test/Dockerfile
index babab6a..23ca795 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -3,7 +3,7 @@ FROM nginx
 ARG ssh_pub_key
 ARG ssh_user
 # Add a user to the container
-RUN adduser -D $ssh_user
+RUN adduser --disabled-password $ssh_user
 USER $ssh_user
 # Add the ssh public key to the container
 RUN mkdir -p $HOME/.ssh