From 1e9b7088d9e77a359012cfd4b904c8914a330004 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sat, 6 Apr 2024 12:40:59 +0300
Subject: [PATCH] sync ymls, edit startup script

---
 _deploy/deoloy.azure.demo.yml       | 15 +++++++--------
 _deploy/deoloy.azure.production.yml | 10 +++-------
 package.json                        |  8 ++++----
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/_deploy/deoloy.azure.demo.yml b/_deploy/deoloy.azure.demo.yml
index 5e868fa..dcb1a7f 100644
--- a/_deploy/deoloy.azure.demo.yml
+++ b/_deploy/deoloy.azure.demo.yml
@@ -1,14 +1,15 @@
 version: "3"
 services:
-  nextjs-app: # https://sofia.mwitnessing.com/
+  nextjs-app: # https://sofia.mwhitnessing.com/
     hostname: jwpw-app-staging # jwpw-nextjs-app-1
     image: docker.d-popov.com/jwpw:latest
     volumes:
       - /mnt/docker_volumes/pw-demo/app/public/content/uploads/:/app/public/content/uploads
     environment:
-      - NODE_ENV=demo
+      - APP_ENV=test
+      - NODE_ENV=test
       - TZ=Europe/Sofia
-      - DATABASE=mysql://jwpwsofia_demo:dwxhns9p9vp248@jwpwsofia:3306/jwpwsofia_demo
+      - DATABASE_URL=mysql://jwpwsofia_demo:dwxhns9p9vp248@mariadb-demo:3306/jwpwsofia_demo
       - UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git
       - GIT_BRANCH=main
       - GIT_USERNAME=deploy
@@ -21,19 +22,17 @@ services:
       - infrastructure_default
   mariadb:
     deploy:
-      replicas: 0
+      replicas: 1
     hostname: mariadb-demo
-    image: mariadb:latest #mariadb:10.4
+    image: mysql:latest #mariadb:10.4
     volumes:
-      - /mnt/docker_volumes/pw-demo/data/mysql:/var/lib/mysql
+      - /mnt/docker_volumes/pw-demo2/data/mysql:/var/lib/mysql
     environment:
       MARIADB_ROOT_PASSWORD: i4966cWBtP3xJ7BLsbsgo93
       MYSQL_ROOT_PASSWORD: i4966cWBtP3xJ7BLsbsgo93
       MYSQL_DATABASE: jwpwsofia_demo
       MYSQL_USER: jwpwsofia_demo
       MYSQL_PASSWORD: dwxhns9p9vp248
-    networks:
-      - infrastructure_default
 networks:
   infrastructure_default:
     external: true
diff --git a/_deploy/deoloy.azure.production.yml b/_deploy/deoloy.azure.production.yml
index 7f8bcdb..0236c1d 100644
--- a/_deploy/deoloy.azure.production.yml
+++ b/_deploy/deoloy.azure.production.yml
@@ -1,6 +1,6 @@
 version: "3"
 services:
-  nextjs-app: # https://sofia.mwitnessing.com/
+  nextjs-app: # https://sofia.mwhitnessing.com/
     hostname: jwpw-app # jwpw-nextjs-app-1
     image: docker.d-popov.com/jwpw:latest
     deploy:
@@ -12,8 +12,8 @@ services:
     environment:
       - NODE_ENV=production
       - TZ=Europe/Sofia
-      - DATABASE=mysql://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
-      #- DATABASE=postgres://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
+      - DATABASE_URL=mysql://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
+      #- DATABASE_URL=postgres://jwpwsofia:dwxhns9p9vp248V39xJyRthUsZ2gR9@mariadb:3306/jwpwsofia
       - UPDATE_CODE_FROM_GIT=true # Set to true to pull latest code from Git
       - GIT_BRANCH=production
       - GIT_USERNAME=deploy
@@ -59,10 +59,6 @@ services:
       apk add --no-cache mariadb-client mariadb-connector-c && \
       echo '0 2 * * * mysqldump -h $$MYSQL_HOST -P 3306 -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE > /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql' > /etc/crontabs/root && \
       crond -f -d 8"
-      # wget -q https://github.com/prasmussen/gdrive/releases/download/2.1.0/gdrive-linux-x64 -O /usr/bin/gdrive && \
-      # chmod +x /usr/bin/gdrive && \
-      # gdrive about --service-account /root/.gdrive_service_account.json && \
-      # echo '0 * * * * /usr/bin/mysqldump -h $$MYSQL_HOST -u$$MYSQL_USER -p$$MYSQL_PASSWORD $$MYSQL_DATABASE | gzip > /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql.gz && gdrive upload --parent $$GOOGLE_DRIVE_FOLDER_ID --service-account /root/.gdrive_service_account.json /backup/$$(date +\\%Y-\\%m-\\%d-\\%H\\%M\\%S)-$$MYSQL_DATABASE.sql.gz' > /etc/crontabs/root && crond -f -d 8"
 networks:
   infrastructure_default:
     external: true
diff --git a/package.json b/package.json
index cedd7b8..370ffd0 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,13 @@
   "scripts": {
     "debug": "node server.js",
     "debug-env": "dotenv -e .env.$APP_ENV -- nodemon --inspect server.js",
+    "nodeenv": "dotenv -e .env.$APP_ENV -- node server.js",
+    "prod": "npx next build && dotenv -e .env.production -- node server.js",
     "build": "next build",
     "buildWin": "npm run build",
     "start": "next start",
     "devNext": "next dev --port 3003 --experimental-https",
-    "test": "dotenv -e .env.$NODE_ENV -- nodemon --inspect server.js",
-    "nodeenv": "dotenv -e .env.$NODE_ENV -- node server.js",
-    "prod": "npx next build && dotenv -e .env.production -- node server.js"
+    "test": "dotenv -e .env.$NODE_ENV -- nodemon --inspect server.js"
   },
   "author": "Dobromir Popov <me@d-popov.com>",
   "_moduleAliases": {
@@ -110,4 +110,4 @@
     "depcheck": "^1.4.7",
     "prisma": "^5.11.0"
   }
-}
+}
\ No newline at end of file