From a5f824c7785ad6ce0b1f580312f2a171dbe6f373 Mon Sep 17 00:00:00 2001 From: "SPRINX0\\prochazka" Date: Mon, 6 Jan 2025 09:00:56 +0100 Subject: [PATCH] changed location of mysql-ssh container --- .github/workflows/build-test-containers.yaml | 10 ++++---- .../mysql-ssh-keyfile}/Dockerfile | 0 .../mysql-ssh-keyfile}/start.sh | 0 .../containers/mysql-ssh-login/Dockerfile | 23 +++++++++++++++++++ e2e-tests/containers/mysql-ssh-login/start.sh | 7 ++++++ e2e-tests/cypress/e2e/connect.cy.js | 2 +- e2e-tests/docker-compose.yaml | 4 ++-- workflow-templates/build-test-containers.yaml | 10 ++++---- 8 files changed, 43 insertions(+), 13 deletions(-) rename e2e-tests/{mysql-ssh => containers/mysql-ssh-keyfile}/Dockerfile (100%) rename e2e-tests/{mysql-ssh => containers/mysql-ssh-keyfile}/start.sh (100%) create mode 100644 e2e-tests/containers/mysql-ssh-login/Dockerfile create mode 100644 e2e-tests/containers/mysql-ssh-login/start.sh diff --git a/.github/workflows/build-test-containers.yaml b/.github/workflows/build-test-containers.yaml index 65af39e71..9b0505b10 100644 --- a/.github/workflows/build-test-containers.yaml +++ b/.github/workflows/build-test-containers.yaml @@ -9,16 +9,16 @@ name: Build test containers - develop - feature/** paths: - - e2e-tests/mysql-ssh/Dockerfile + - e2e-tests/containers jobs: build-docker-ssh: runs-on: ubuntu-latest steps: - name: Checkout source uses: actions/checkout@v3 - - name: Build mysql-ssh image + - name: Build mysql-ssh-login image run: | - docker build -t dbgate/mysql-ssh:latest e2e-tests/mysql-ssh + docker build -t dbgate/mysql-ssh-login:latest e2e-tests/containers/mysql-ssh-login - name: Log in to GHCR uses: docker/login-action@v2 with: @@ -27,5 +27,5 @@ jobs: password: '${{ secrets.GITHUB_TOKEN }}' - name: Push image to GHCR run: | - docker tag dbgate/mysql-ssh:latest ghcr.io/dbgate/mysql-ssh:latest - docker push ghcr.io/dbgate/mysql-ssh:latest + docker tag dbgate/mysql-ssh-login:latest ghcr.io/dbgate/mysql-ssh-login:latest + docker push ghcr.io/dbgate/mysql-ssh-login:latest diff --git a/e2e-tests/mysql-ssh/Dockerfile b/e2e-tests/containers/mysql-ssh-keyfile/Dockerfile similarity index 100% rename from e2e-tests/mysql-ssh/Dockerfile rename to e2e-tests/containers/mysql-ssh-keyfile/Dockerfile diff --git a/e2e-tests/mysql-ssh/start.sh b/e2e-tests/containers/mysql-ssh-keyfile/start.sh similarity index 100% rename from e2e-tests/mysql-ssh/start.sh rename to e2e-tests/containers/mysql-ssh-keyfile/start.sh diff --git a/e2e-tests/containers/mysql-ssh-login/Dockerfile b/e2e-tests/containers/mysql-ssh-login/Dockerfile new file mode 100644 index 000000000..b62bae980 --- /dev/null +++ b/e2e-tests/containers/mysql-ssh-login/Dockerfile @@ -0,0 +1,23 @@ +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/* + +RUN mkdir /var/run/sshd + +RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config +RUN echo 'root:root' | chpasswd + +RUN service mysql start && \ + mysql -uroot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root'; FLUSH PRIVILEGES;" && \ + service mysql stop + +EXPOSE 22 + +COPY start.sh /start.sh + +RUN chmod +x /start.sh + +CMD ["/start.sh"] diff --git a/e2e-tests/containers/mysql-ssh-login/start.sh b/e2e-tests/containers/mysql-ssh-login/start.sh new file mode 100644 index 000000000..ef09d973e --- /dev/null +++ b/e2e-tests/containers/mysql-ssh-login/start.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +service ssh start + +service mysql start + +tail -f /dev/null diff --git a/e2e-tests/cypress/e2e/connect.cy.js b/e2e-tests/cypress/e2e/connect.cy.js index 8669670f3..f524bb3da 100644 --- a/e2e-tests/cypress/e2e/connect.cy.js +++ b/e2e-tests/cypress/e2e/connect.cy.js @@ -45,7 +45,7 @@ describe('Initialization', () => { cy.get('[data-testid=ConnectionSshTunnelFields_sshLogin]').clear().type('root'); cy.get('[data-testid=ConnectionSshTunnelFields_sshPassword]').clear().type('root'); if (runOnCI) { - cy.get('[data-testid=ConnectionSshTunnelFields_sshHost]').clear().type('mysql-ssh'); + cy.get('[data-testid=ConnectionSshTunnelFields_sshHost]').clear().type('mysql-ssh-login'); } else { cy.get('[data-testid=ConnectionSshTunnelFields_sshPort]').clear().type('16006'); } diff --git a/e2e-tests/docker-compose.yaml b/e2e-tests/docker-compose.yaml index e983cdd4a..8ab751982 100644 --- a/e2e-tests/docker-compose.yaml +++ b/e2e-tests/docker-compose.yaml @@ -17,8 +17,8 @@ services: environment: - MYSQL_ROOT_PASSWORD=Pwd2020Db - mysql-ssh: - build: mysql-ssh + mysql-ssh-login: + build: mysql-ssh-login restart: always ports: - 16005:3306 diff --git a/workflow-templates/build-test-containers.yaml b/workflow-templates/build-test-containers.yaml index ad1e438eb..d8d317286 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/mysql-ssh/Dockerfile" + - e2e-tests/containers jobs: build-docker-ssh: @@ -16,9 +16,9 @@ jobs: - name: Checkout source uses: actions/checkout@v3 - - name: Build mysql-ssh image + - name: Build mysql-ssh-login image run: | - docker build -t dbgate/mysql-ssh:latest e2e-tests/mysql-ssh + docker build -t dbgate/mysql-ssh-login:latest e2e-tests/containers/mysql-ssh-login - name: Log in to GHCR uses: docker/login-action@v2 @@ -29,5 +29,5 @@ jobs: - name: Push image to GHCR run: | - docker tag dbgate/mysql-ssh:latest ghcr.io/dbgate/mysql-ssh:latest - docker push ghcr.io/dbgate/mysql-ssh:latest + docker tag dbgate/mysql-ssh-login:latest ghcr.io/dbgate/mysql-ssh-login:latest + docker push ghcr.io/dbgate/mysql-ssh-login:latest