Skip to content

Commit

Permalink
Adding ci specific docker-compose file.
Browse files Browse the repository at this point in the history
  • Loading branch information
arvinsingla committed Apr 25, 2024
1 parent f3f7560 commit f97eb9c
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
chmod 777 trust uploads modules templates_c cache mainfile.php
- name: Run Docker Compose
run: |
docker-compose up -d
docker-compose -f docker-compose.ci.yaml up -d
- name: Wait for mysql
uses: smurfpandey/wait-for-it@main
with:
Expand Down
31 changes: 31 additions & 0 deletions docker-compose.ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
version: "3"

services:
web:
image: "formulize/php-dev:latest"
restart: 'no'
depends_on:
- mariadb
volumes:
- .:/var/www/html/
- ./trust:/var/www/trust
- ./docker/php/conf.d/formulize.ini:/usr/local/etc/php/conf.d/formulize.ini
ports:
- '8080:80'
links:
- mariadb
mariadb:
image: "mariadb:lts"
restart: 'no'
ports:
- 3306:3306
expose:
- "3306"
volumes:
- ./docker/mariadb/seed:/docker-entrypoint-initdb.d
- ./docker/mariadb/conf.d:/etc/mysql/conf.d
environment:
MYSQL_ROOT_PASSWORD: "abc123"
MYSQL_DATABASE: "formulize"
MYSQL_USER: "user"
MYSQL_PASSWORD: "password"
2 changes: 1 addition & 1 deletion tests/e2e/formulize-core/001-install-formulize.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ test.describe('Installer', () => {
// await expect(page.locator('#modulesinstall')).toContainText('Module Protector installed successfully');
await page.getByRole('button', { name: 'Next' }).click();
// Install finished
// await expect(page.locator('h2')).toContainText('Installation completed');
await expect(page.locator('h2')).toContainText('Installation completed');
await expect(page.getByRole('button', { name: 'Show my site' })).toBeVisible();
await page.getByRole('button', { name: 'Show my site' }).click();
// Running instance
Expand Down

0 comments on commit f97eb9c

Please sign in to comment.