From c5f0ea5d86ac638451e61d404d7487672ae63aee Mon Sep 17 00:00:00 2001
From: Tom Zajac <SharakPL@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:33:11 +0100
Subject: [PATCH 1/4] Match db credentials with prestashop config
`MYSQL_DATABASE` must match `DB_NAME`
`MYSQL_ROOT_PASSWORD` must match `DB_PASSWD`
---
docker-compose.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 8c507d7bdf973..458fcf2b779f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,8 +16,8 @@ services:
volumes:
- db-data:/var/lib/mysql
environment:
- MYSQL_ROOT_PASSWORD: prestashop
- MYSQL_DATABASE: prestashop
+ MYSQL_ROOT_PASSWORD: ${DB_PASSWD:-prestashop}
+ MYSQL_DATABASE: ${DB_NAME:-prestashop}
restart: unless-stopped
keycloak:
From befb6397d280b4b3516c46839524d9af2f8843ff Mon Sep 17 00:00:00 2001
From: Tom Zajac <SharakPL@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:35:29 +0100
Subject: [PATCH 2/4] Remove unused volumes
---
docker-compose.yml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 458fcf2b779f7..b3e801de2b456 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,10 +3,6 @@ version: '2.1'
volumes:
db-data:
name: db-data
- vendor:
- name: vendor
- var:
- name: var
services:
mysql:
From 79c35c68fb6366d41f8e5396c31a410af0243d73 Mon Sep 17 00:00:00 2001
From: Tom Zajac <SharakPL@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:41:38 +0100
Subject: [PATCH 3/4] Do not force db volume name
Forcing specific name for the volume prevents using more than 1 docker instances because next one would want to use the same `db-data` volume. Default behavior should be used where docker prefixes the volume parameter with project directory eg. `prestashop_db-data`.
---
docker-compose.yml | 1 -
1 file changed, 1 deletion(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index b3e801de2b456..aeb5c3cefc07f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,6 @@ version: '2.1'
volumes:
db-data:
- name: db-data
services:
mysql:
From aa4d2fdae02fc6aa46ee41f3cc34c9f77b25b9b9 Mon Sep 17 00:00:00 2001
From: Tom Zajac <SharakPL@users.noreply.github.com>
Date: Mon, 26 Feb 2024 14:46:02 +0100
Subject: [PATCH 4/4] Update docker_run_git.sh
Password is shown anyway so at least it should be the right one :)
---
.docker/docker_run_git.sh | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.docker/docker_run_git.sh b/.docker/docker_run_git.sh
index ba5978ad0eedc..d3f35b5ca527e 100755
--- a/.docker/docker_run_git.sh
+++ b/.docker/docker_run_git.sh
@@ -148,8 +148,7 @@ echo "** Front-office: http://${PS_DOMAIN}/"
echo "** Back-office: http://${PS_DOMAIN}/admin-dev"
echo "** Login with:"
echo "** username: ${ADMIN_MAIL}"
-echo "** password: Correct Horse Battery Staple"
-echo "** (if you didn't define your own in ADMIN_PASSWORD environment variable)"
+echo "** password: ${ADMIN_PASSWD}"
if [ $PS_USE_DOCKER_MAILDEV -eq 1 ]; then
echo "**"
echo "** To view sent emails point your browser to http://localhost:1080/"