dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-02 21:53:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed location of mysql-ssh container

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-01-06 09:00:56 +01:00
parent 4f5bb563e8
commit a5f824c778
8 changed files with 43 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/build-test-containers.yaml vendored
View File

@@ -9,16 +9,16 @@ name: Build test containers
- develop - develop
- feature/** - feature/**
paths: paths:
- e2e-tests/mysql-ssh/Dockerfile - e2e-tests/containers
jobs: jobs:
build-docker-ssh: build-docker-ssh:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout source - name: Checkout source
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build mysql-ssh image - name: Build mysql-ssh-login image
run: | 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 - name: Log in to GHCR
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
@@ -27,5 +27,5 @@ jobs:
password: '${{ secrets.GITHUB_TOKEN }}' password: '${{ secrets.GITHUB_TOKEN }}'
- name: Push image to GHCR - name: Push image to GHCR
run: | run: |
docker tag dbgate/mysql-ssh:latest 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:latest docker push ghcr.io/dbgate/mysql-ssh-login:latest

0
e2e-tests/mysql-ssh/Dockerfile → e2e-tests/containers/mysql-ssh-keyfile/Dockerfile
View File

0
e2e-tests/mysql-ssh/start.sh → e2e-tests/containers/mysql-ssh-keyfile/start.sh
View File

23
e2e-tests/containers/mysql-ssh-login/Dockerfile Normal file
View File

@@ -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"]

7
e2e-tests/containers/mysql-ssh-login/start.sh Normal file
View File

@@ -0,0 +1,7 @@
#!/bin/bash
service ssh start
service mysql start
tail -f /dev/null

2
e2e-tests/cypress/e2e/connect.cy.js
View File

@@ -45,7 +45,7 @@ describe('Initialization', () => {
cy.get('[data-testid=ConnectionSshTunnelFields_sshLogin]').clear().type('root'); cy.get('[data-testid=ConnectionSshTunnelFields_sshLogin]').clear().type('root');
cy.get('[data-testid=ConnectionSshTunnelFields_sshPassword]').clear().type('root'); cy.get('[data-testid=ConnectionSshTunnelFields_sshPassword]').clear().type('root');
if (runOnCI) { if (runOnCI) {
cy.get('[data-testid=ConnectionSshTunnelFields_sshHost]').clear().type('mysql-ssh'); cy.get('[data-testid=ConnectionSshTunnelFields_sshHost]').clear().type('mysql-ssh-login');
} else { } else {
cy.get('[data-testid=ConnectionSshTunnelFields_sshPort]').clear().type('16006'); cy.get('[data-testid=ConnectionSshTunnelFields_sshPort]').clear().type('16006');
} }

4
e2e-tests/docker-compose.yaml
View File

@@ -17,8 +17,8 @@ services:
environment: environment:
- MYSQL_ROOT_PASSWORD=Pwd2020Db - MYSQL_ROOT_PASSWORD=Pwd2020Db
mysql-ssh: mysql-ssh-login:
build: mysql-ssh build: mysql-ssh-login
restart: always restart: always
ports: ports:
- 16005:3306 - 16005:3306

10
workflow-templates/build-test-containers.yaml
View File

@@ -7,7 +7,7 @@ on:
- develop - develop
- 'feature/**' - 'feature/**'
paths: paths:
- "e2e-tests/mysql-ssh/Dockerfile" - e2e-tests/containers
jobs: jobs:
build-docker-ssh: build-docker-ssh:
@@ -16,9 +16,9 @@ jobs:
- name: Checkout source - name: Checkout source
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Build mysql-ssh image - name: Build mysql-ssh-login image
run: | 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 - name: Log in to GHCR
uses: docker/login-action@v2 uses: docker/login-action@v2
@@ -29,5 +29,5 @@ jobs:
- name: Push image to GHCR - name: Push image to GHCR
run: | run: |
docker tag dbgate/mysql-ssh:latest 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:latest docker push ghcr.io/dbgate/mysql-ssh-login:latest