From fef3ffd9965b07cc76461cfcb6e023e302923612 Mon Sep 17 00:00:00 2001
From: "SPRINX0\\prochazka" <jan.prochazka@sprinx.com>
Date: Mon, 6 Jan 2025 09:29:27 +0100
Subject: [PATCH] workflow fix

---
 .github/workflows/build-test-containers.yaml     |  2 +-
 .github/workflows/run-tests.yaml                 |  4 ++--
 .../containers/mysql-ssh-keyfile/Dockerfile      | 16 ++++++++++------
 workflow-templates/build-test-containers.yaml    |  2 +-
 workflow-templates/run-tests.yaml                |  4 ++--
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-test-containers.yaml b/.github/workflows/build-test-containers.yaml
index 9b0505b10..50c2c501d 100644
--- a/.github/workflows/build-test-containers.yaml
+++ b/.github/workflows/build-test-containers.yaml
@@ -9,7 +9,7 @@ name: Build test containers
       - develop
       - feature/**
     paths:
-      - e2e-tests/containers
+      - e2e-tests/containers/**
 jobs:
   build-docker-ssh:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 8c85b5c45..c940a0eb2 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -90,5 +90,5 @@ jobs:
         image: 'gvenzl/oracle-xe:21-slim'
         env:
           ORACLE_PASSWORD: Pwd2020Db
-      mysql-ssh:
-        image: 'ghcr.io/dbgate/mysql-ssh:latest'
+      mysql-ssh-login:
+        image: 'ghcr.io/dbgate/mysql-ssh-login:latest'
diff --git a/e2e-tests/containers/mysql-ssh-keyfile/Dockerfile b/e2e-tests/containers/mysql-ssh-keyfile/Dockerfile
index b62bae980..f81aedf9d 100644
--- a/e2e-tests/containers/mysql-ssh-keyfile/Dockerfile
+++ b/e2e-tests/containers/mysql-ssh-keyfile/Dockerfile
@@ -2,13 +2,18 @@ FROM ubuntu:22.04
 
 RUN apt-get update && \
     apt-get install -y openssh-server mysql-server && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir /var/run/sshd
 
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-RUN echo 'root:root' | chpasswd
+RUN sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' /etc/ssh/sshd_config && \
+    sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin without-password/' /etc/ssh/sshd_config
+
+RUN mkdir -p /root/.ssh && chmod 700 /root/.ssh
+
+COPY mykey.pub /root/.ssh/authorized_keys
+
+RUN chmod 600 /root/.ssh/authorized_keys
 
 RUN service mysql start && \
     mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'; FLUSH PRIVILEGES;" && \
@@ -17,7 +22,6 @@ RUN service mysql start && \
 EXPOSE 22
 
 COPY start.sh /start.sh
-
 RUN chmod +x /start.sh
 
-CMD ["/start.sh"]
+CMD ["/start.sh"]
\ No newline at end of file
diff --git a/workflow-templates/build-test-containers.yaml b/workflow-templates/build-test-containers.yaml
index d8d317286..8f8e31476 100644
--- a/workflow-templates/build-test-containers.yaml
+++ b/workflow-templates/build-test-containers.yaml
@@ -7,7 +7,7 @@ on:
       - develop
       - 'feature/**'
     paths:
-      - e2e-tests/containers
+      - e2e-tests/containers/**
 
 jobs:
   build-docker-ssh:
diff --git a/workflow-templates/run-tests.yaml b/workflow-templates/run-tests.yaml
index 336d4aee2..c615a98c0 100644
--- a/workflow-templates/run-tests.yaml
+++ b/workflow-templates/run-tests.yaml
@@ -111,5 +111,5 @@ jobs:
         env:
           ORACLE_PASSWORD: Pwd2020Db
           
-      mysql-ssh:
-        image: ghcr.io/dbgate/mysql-ssh:latest
+      mysql-ssh-login:
+        image: ghcr.io/dbgate/mysql-ssh-login:latest