From 2bb91b2b5f0b904e4ad90f8e9cfda68a13f0e9a9 Mon Sep 17 00:00:00 2001
From: Murat Cakir <muratc@smartstore.de>
Date: Fri, 12 Aug 2022 21:57:09 +0200
Subject: [PATCH] Some final Docker stuff

---
 build/dockerize.linux.nobuild.sh   |  2 +-
 build/dockerize.linux.sh           |  2 +-
 build/dockerize.windows.nobuild.sh |  2 +-
 docker-compose.sqlserver.yml       | 34 +++++++++++-----------
 docker-compose.yml                 | 46 +++++++++++++++---------------
 5 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/build/dockerize.linux.nobuild.sh b/build/dockerize.linux.nobuild.sh
index c11da79d5..105b3e15e 100644
--- a/build/dockerize.linux.nobuild.sh
+++ b/build/dockerize.linux.nobuild.sh
@@ -1,3 +1,3 @@
 cd ..
-docker build -t smartstore -f NoBuild.Dockerfile .
+docker build -t ghcr.io/smartstore/smartstore-linux -f NoBuild.Dockerfile .
 echo 'Press enter to exit...'; read dummy;
\ No newline at end of file
diff --git a/build/dockerize.linux.sh b/build/dockerize.linux.sh
index a89707f17..e196848a6 100644
--- a/build/dockerize.linux.sh
+++ b/build/dockerize.linux.sh
@@ -1,3 +1,3 @@
 cd ..
-docker build -t smartstore .
+docker build -t ghcr.io/smartstore/smartstore-linux .
 echo 'Press enter to exit...'; read dummy;
\ No newline at end of file
diff --git a/build/dockerize.windows.nobuild.sh b/build/dockerize.windows.nobuild.sh
index 9fc76c632..f3f4a3257 100644
--- a/build/dockerize.windows.nobuild.sh
+++ b/build/dockerize.windows.nobuild.sh
@@ -1,3 +1,3 @@
 cd ..
-docker build -t smartstore -f Nano.Dockerfile .
+docker build -t ghcr.io/smartstore/smartstore-windows -f Nano.Dockerfile .
 echo 'Press enter to exit...'; read dummy;
\ No newline at end of file
diff --git a/docker-compose.sqlserver.yml b/docker-compose.sqlserver.yml
index 534dffc94..29f3778d2 100644
--- a/docker-compose.sqlserver.yml
+++ b/docker-compose.sqlserver.yml
@@ -1,21 +1,21 @@
 services:
-    web:
-        volumes:
-            - "D:/mount/smtenants/sqlserver:/app/App_Data/Tenants"
-    db:
-        image: "mcr.microsoft.com/mssql/server"
-        container_name: sqlserver
-        environment:
-            SA_PASSWORD: "Smartstore2022!"
-            ACCEPT_EULA: "Y"
-            MSSQL_PID: "Express"
-        ports:
-          - '1434:1433'
-        expose:
-          - '1433'
-        volumes:
-          - mssql_system:/var/opt/mssql/
-          - mssql_user:/var/opt/sqlserver/
+  web:
+    volumes:
+      - "D:/mount/smtenants/sqlserver:/app/App_Data/Tenants"
+  db:
+    image: "mcr.microsoft.com/mssql/server"
+    container_name: sqlserver
+    environment:
+      SA_PASSWORD: "Smartstore2022!"
+      ACCEPT_EULA: "Y"
+      MSSQL_PID: "Express"
+    ports:
+      - '1434:1433'
+    expose:
+      - '1433'
+    volumes:
+      - mssql_system:/var/opt/mssql/
+      - mssql_user:/var/opt/sqlserver/
 
 volumes:
   mssql_system:
diff --git a/docker-compose.yml b/docker-compose.yml
index 59c4ffd2e..f446f3725 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,28 +1,28 @@
 version: "3.4"
 services:
-    web:
-        image: smartstore
-        container_name: web
-        ports:
-            - "80:80"
-        depends_on:
-            - db
-        volumes:
-            - "D:/mount/smtenants/mysql:/app/App_Data/Tenants"
-    db:
-        image: mysql
-        container_name: mysql
-        environment:
-            #MYSQL_DATABASE: smartstore
-            #MYSQL_USER: "root"
-            MYSQL_PASSWORD: "Smartstore2022!"
-            MYSQL_ROOT_PASSWORD: "Smartstore2022!"
-        ports:
-          - '3307:3306'
-        expose:
-          - '3306'
-        volumes:
-          - mysql:/var/lib/mysql
+  web:
+    image: ghcr.io/smartstore/smartstore-linux
+    container_name: web
+    ports:
+      - "80:80"
+    depends_on:
+      - db
+    volumes:
+      - "D:/mount/smtenants/mysql:/app/App_Data/Tenants"
+  db:
+    image: mysql
+    container_name: mysql
+    environment:
+      #MYSQL_DATABASE: smartstore
+      #MYSQL_USER: "root"
+      MYSQL_PASSWORD: "Smartstore2022!"
+      MYSQL_ROOT_PASSWORD: "Smartstore2022!"
+    ports:
+      - '3307:3306'
+    expose:
+      - '3306'
+    volumes:
+      - mysql:/var/lib/mysql
 
 volumes:
   mysql:
\ No newline at end of file