From ad4c2fac22925b6a1d5717e09f87576497a0dde2 Mon Sep 17 00:00:00 2001 From: Varun Date: Wed, 25 Oct 2023 16:19:02 +1100 Subject: [PATCH] #1247 #1248 Feat: Cypress UI testing + Postgres Arg for installer --- devcontainer-example/docker-compose.yml | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/devcontainer-example/docker-compose.yml b/devcontainer-example/docker-compose.yml index 4fe52586..fa7dfe2c 100644 --- a/devcontainer-example/docker-compose.yml +++ b/devcontainer-example/docker-compose.yml @@ -1,33 +1,33 @@ version: "3.7" services: - # mariadb: - # image: mariadb:10.6 - # command: - # - --character-set-server=utf8mb4 - # - --collation-server=utf8mb4_unicode_ci - # - --skip-character-set-client-handshake - # - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 - # environment: - # MYSQL_ROOT_PASSWORD: 123 - # volumes: - # - mariadb-data:/var/lib/mysql - - # Enable PostgreSQL only if you use it, see development/README.md for more information. - postgresql: - image: postgres:11.8 + mariadb: + image: docker.io/mariadb:10.6 + command: + - --character-set-server=utf8mb4 + - --collation-server=utf8mb4_unicode_ci + - --skip-character-set-client-handshake + - --skip-innodb-read-only-compressed # Temporary fix for MariaDB 10.6 environment: - POSTGRES_PASSWORD: 123 + MYSQL_ROOT_PASSWORD: 123 volumes: - - postgresql-data:/var/lib/postgresql/data + - mariadb-data:/var/lib/mysql + + # # Enable PostgreSQL only if you use it, see development/README.md for more information. + # postgresql: + # image: postgres:11.8 + # environment: + # POSTGRES_PASSWORD: 123 + # volumes: + # - postgresql-data:/var/lib/postgresql/data redis-cache: - image: redis:alpine + image: docker.io/redis:alpine redis-queue: - image: redis:alpine + image: docker.io/redis:alpine frappe: - image: frappe/bench:latest + image: docker.io/frappe/bench:latest command: sleep infinity environment: - SHELL=/bin/bash @@ -46,7 +46,7 @@ services: # it can find file "cypress.json" and show integration specs # https://on.cypress.io/command-line#cypress-open entrypoint: 'sleep infinity' - image: "cypress/included:latest" + image: "docker.io/cypress/included:latest" #command: sleep infinity environment: - SHELL=/bin/bash @@ -65,5 +65,5 @@ services: - ..:/workspace:z,cached network_mode: "host" volumes: - #mariadb-data: - postgresql-data: + mariadb-data: + #postgresql-data: