From bc2967ef1031dffaab98aab3cc7470db86006f4a Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 10 May 2024 14:14:29 +0000 Subject: [PATCH] Adjust mariadb docker settings and connection strings Reflect the use of external containers in connection strings, and pass params into our calls to docker run --- .env.gitpod | 6 +++--- .gitpod.yml | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.env.gitpod b/.env.gitpod index f40bbe54..db0f2d68 100644 --- a/.env.gitpod +++ b/.env.gitpod @@ -4,15 +4,15 @@ PORT=9000 PYTHONDONTWRITEBYTECODE=1 SECRET_KEY='some-key' -DATABASE_URL=mysql://root:deploy@localhost:3306/greencheck -DATABASE_URL_READ_ONLY=mysql://root:deploy@localhost:3306/greencheck +DATABASE_URL=mysql://root@127.0.0.1:3306/greencheck +DATABASE_URL_READ_ONLY=mysql://root:deploy@127.0.0.1:3306/greencheck EXPLORER_TOKEN="some-token" MAILGUN_API_KEY="50 characters long-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" # used to stop defaulting to debug DJANGO_SETTINGS_MODULE='greenweb.settings.development' -RABBITMQ_URL=amqp://guest:guest@localhost:5672/ +RABBITMQ_URL=amqp://guest:guest@127.0.0.1:5672/ DOMAIN_SNAPSHOT_BUCKET = "tgwf-green-domains-dev" diff --git a/.gitpod.yml b/.gitpod.yml index 705fd76e..af80f08f 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -34,14 +34,12 @@ tasks: command: > docker run --rm - --hostname green-mariadb + --hostname + --env green-mariadb + --env MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=True + --env MARIADB_DATABASE=greencheck -p 3306:3306 mariadb:10.11 - env: - MARIADB_USER: deploy - MARIADB_PASSWORD: deploy - MARIADB_ROOT_PASSWORD: deploy - MARIADB_DATABASE: greencheck - name: mailhog command: >