Merge branch 'fix/web-install' into 'master'

Fix/web install

See merge request riconet-public/shopware/sw6-project-skeleton!4

README.md

 # Shopware 6 project skeleton
 This repo is a fork of shopwares original composer project (Fork of https://github.com/shopware/production)
 
-## Create the project
-```bash
-composer create-project psvneo/sw6-project-skeleton
-```
+## How to install (Web)
+* Run `git clone https://git.riconnect.de/riconet-public/shopware/sw6-project-skeleton MyProjectName` to clone this repo.
+* Remove `.git` directory (`rm -rf .git`).
+* Run `docker-compose up -d` and wait *15* seconds.
+* Run `docker-compose exec shopware /bin/bash -c "composer install"` to build the backend.
+* Run `docker-compose exec shopware /bin/bash -c "chown -R www-data:www-data ."` to build the backend.
+* Run `docker-compose exec shopware /bin/bash -c "chmod -R g+rw ."` to build the backend.
+* Open `http://localhost` to start the web installation.
+  
+|Input         |Wert    |
+|--------------|--------|
+|Server        |db      |
+|Benutzer      |root    |
+|Passwort      |1234    |
+|Name          |shopware|
 
-## Initialise a new shopware installation
+* After you finish the installation, run `docker-compose exec shopware /bin/bash -c "bin/build-administration.sh"` to build the administration.
+
+## How to install (Cli)
 ```bash
 bin/docker-init.sh
 ```
@@ -32,7 +45,7 @@ bin/docker-build.sh
 | Administration | http://localhost/admin |
 | Store front    | http://localhost       |
 
-### Default admin user credentials
+### Default admin user credentials (Cli installs)
 |          | Value    |
 |----------|----------|
 | username | admin    |
@@ -48,6 +61,9 @@ bin/docker-build.sh
 bin/docker-clear-cache.sh
 ```
 
+## Enter shopware container
+Run `docker-compose exec shopware bash`
+
 ## Catch mails using Mailhog
 Mailhog is reachable by the following url: `http://localhost:8025`
 

bin/docker-fix-key-rights.sh

+#!/bin/bash
+echo "[INFO] Fix access rights";
+docker-compose exec shopware /bin/bash -c "chmod 600 config/jwt/private.pem";
+docker-compose exec shopware /bin/bash -c "chmod 600 config/jwt/public.pem";

var/plugins.json

@@ -124,6 +124,7 @@
             "webpack": null,
             "styleFiles": [
                 "vendor\/shopware\/storefront\/Resources\/app\/storefront\/src\/scss\/base.scss",
+                "vendor\/shopware\/storefront\/Resources\/app\/storefront\/src\/scss\/skin\/shopware\/_base.scss",
                 "@Plugins"
             ]
         }
@@ -146,4 +147,4 @@
             "styleFiles": []
         }
     }
-}
+}
\ No newline at end of file