Simplify docker setup

Author: shyim

Dockerfile

@@ -70,43 +70,25 @@ Change into the project directory, then start the docker containers, add the cac
 cd downtown
 ```
 
-```shell script
-docker-compose build
-```
-
 ```shell script
 docker-compose up -d
 ```
 
 ```shell script
-docker-compose exec app_server sh
+docker-compose exec cli bash
 ```
 
 When inside the app container, do a basic install, generate a JWT secret and an App Secret, then exit the container:
 
 ```shell script
+bin/console system:setup
 bin/console system:install --create-database --basic-setup --force
 ```
 
-```shell script
-bin/console system:generate-jwt-secret --force
-```
-
-```shell script
-bin/console system:generate-app-secret # put into docker-compose.yml
-```
-
 ```shell script
 exit
 ```
 
-The App Secret is only shown on screen, you have to put it manually into the `docker-compose.yml`, right after `- APP_SECRET=`.
-
-Then regenerate the containers by re-executing up:
-
-```shell script
-docker-compose up -d
-```
 
 Please note:
 

README.md

@@ -1,38 +1,25 @@
-#override defaults for dev
 version: "3.7"
 
 services:
   app_server:
-    image: downtown:local
-    build: .
+    image: shyim/shopware-platform-nginx-production:php74
     depends_on:
       - mysql
     ports:
-      - 8000:8000
-      - 8005:8000
-    environment:
-      # define yourself
-      - DATABASE_URL=mysql://downtown:uptown@mysql:3306/downtown
-      - APP_URL=http://localhost:8000
-      - APP_SECRET=
-      - INSTANCE_ID=
+      - 80:80
+    volumes:
+      - ".:/var/www/html"
+
+  cli:
+    image: shyim/shopware-cli:php74
+    tty: true
     volumes:
-      - "./config/jwt:/sw6/config/jwt"
-      - "./custom:/sw6/custom"
-      - "./public/bundles:/sw6/public/bundles"
-      - "./public/media:/sw6/public/media"
-      - "./public/sitemap:/sw6/public/sitemap"
-      - "./public/theme:/sw6/public/theme"
-      - "./public/thumbnail:/sw6/public/thumbnail"
-      - "./var:/sw6/var"
-      - "./src:/sw6/src"
+      - ".:/var/www/html"
 
   mysql:
     image: mysql:5.7
-    tmpfs:
-      - /var/lib/mysql:uid=999,gid=999
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=downtown
       - MYSQL_USER=downtown
-      - MYSQL_PASSWORD=uptown
+      - MYSQL_PASSWORD=uptown

docker-compose.yml

@@ -12,11 +12,12 @@ help:
 # ------------------------------------------------------------------------------------------------------------
 
 setup: ## Installs Downtown
-	docker-compose build
 	docker-compose up -d
-	docker-compose exec app_server sh -c 'bin/console system:install --create-database --basic-setup --force'
-	docker-compose exec app_server sh -c 'bin/console system:generate-jwt-secret --force'
-	docker-compose exec app_server sh -c 'bin/console system:generate-app-secret'
+	docker-compose exec cli sh -c 'composer install'
+	docker-compose exec cli sh -c 'bin/console system:setup'
+	docker-compose exec cli sh -c 'bin/console system:install --create-database --basic-setup --force'
+	docker-compose exec cli sh -c 'bin/console system:generate-jwt-secret --force'
+	docker-compose exec cli sh -c 'bin/console system:generate-app-secret'
 
 merchant: ## Runs the merchant portal
 	cd src/MerchantFrontend npm install && npm run start

makefile

@@ -16,7 +16,7 @@ public function update(Connection $connection): void
     {
         $sql = <<<SQL
         ALTER TABLE `sold_voucher`
-            DROP INDEX `uniq.merchant_id__code`;
+            DROP INDEX `sold_voucher`;
         
         ALTER TABLE `sold_voucher`
             ADD UNIQUE KEY `uniq.order_line_item__code` (`order_line_item_id`,`code`);