From 8b4d116dab3f93612977f2cc4e893f24d3964f70 Mon Sep 17 00:00:00 2001
From: GustavH <gkhaavik@gmail.com>
Date: Mon, 20 Jan 2025 21:09:56 +0100
Subject: [PATCH] updating .env.example with new fields

---
 deploy/.env.example       | 17 +++++++++++------
 deploy/docker-compose.yml |  9 ++++++---
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/deploy/.env.example b/deploy/.env.example
index 18ff18a..89a7e05 100644
--- a/deploy/.env.example
+++ b/deploy/.env.example
@@ -4,18 +4,23 @@ DATASOURCE_USERNAME=commercifyapp
 DATASOURCE_PASSWORD=password123!
 STRIPE_SECRET_TEST_KEY=
 STRIPE_WEBHOOK_SECRET=
-STRIPE_WEBHOOK_ENDPOINT=http://localhost:6091/api/v1/payments/stripe/webhooks
 JWT_SECRET_KEY=
 ADMIN_EMAIL=admin@commercify.app
-ADMIN_PASSWORD=admin
+ADMIN_PASSWORD=commercifyadmin123!
 MOBILEPAY_CLIENT_ID=
 MOBILEPAY_CLIENT_SECRET=
 MOBILEPAY_SUBSCRIPTION_KEY=
 MOBILEPAY_MERCHANT_ID=
-MOBILEPAY_API_URL=
+MOBILEPAY_API_URL=https://apitest.vipps.no
 MOBILEPAY_SYSTEM_NAME=Commercify
+# used for outgoing emails
+MAIL_HOST=smtp.gmail.com
+MAIL_PORT=587
 MAIL_USERNAME=
 MAIL_PASSWORD=
-MAIL_HOST=smtp.ethereal.email
-MAIL_PORT=587
-FRONTEND_URL=http://localhost:3000
\ No newline at end of file
+# used for email confirmation token (WIP)
+FRONTEND_URL=http://localhost:3000
+# The email address that will receive new order notifications emails
+ORDER_EMAIL_RECEIVER=
+# used for mobilepay webhook callback
+BACKEND_HOST=
\ No newline at end of file
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index f670adc..5d7fb96 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   mysql:
-    image: mysql:8.0
+    image: mysql:9.1
     container_name: commercify-mysql
     environment:
       - MYSQL_DATABASE=commercifydb
@@ -29,8 +29,6 @@ services:
       - SPRING_DATASOURCE_URL=${DATASOURCE_URL}
       - SPRING_DATASOURCE_USERNAME=${DATASOURCE_USERNAME}
       - SPRING_DATASOURCE_PASSWORD=${DATASOURCE_PASSWORD}
-      - STRIPE_SECRET_TEST_KEY=${STRIPE_SECRET_TEST_KEY}
-      - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
       - JWT_SECRET_KEY=${JWT_SECRET_KEY}
       - ADMIN_EMAIL=${ADMIN_EMAIL}
       - ADMIN_PASSWORD=${ADMIN_PASSWORD}
@@ -40,10 +38,15 @@ services:
       - MOBILEPAY_SUBSCRIPTION_KEY=${MOBILEPAY_SUBSCRIPTION_KEY}
       - MOBILEPAY_API_URL=${MOBILEPAY_API_URL}
       - MOBILEPAY_SYSTEM_NAME=${MOBILEPAY_SYSTEM_NAME}
+      - STRIPE_SECRET_TEST_KEY=${STRIPE_SECRET_TEST_KEY}
+      - STRIPE_WEBHOOK_SECRET=${STRIPE_WEBHOOK_SECRET}
       - MAIL_USERNAME=${MAIL_USERNAME}
       - MAIL_PASSWORD=${MAIL_PASSWORD}
       - MAIL_HOST=${MAIL_HOST}
       - MAIL_PORT=${MAIL_PORT}
+      - ORDER_EMAIL_RECEIVER=${ORDER_EMAIL_RECEIVER}
+      - FRONTEND_URL=${FRONTEND_URL}
+      - BACKEND_HOST=${BACKEND_HOST}
     depends_on:
       mysql:
         condition: service_healthy