Merge pull request #2 from Elastic-Suite/feat-moveSrc

Move src outside the container for debugging

Author: botisSmile

ReadMe.md

@@ -8,6 +8,10 @@
   git clone git@github.com:Elastic-Suite/gally-shopware-connector.git plugins/GallyPlugin
   git clone git@github.com:Elastic-Suite/shopware-lumage-sample-data-plugin.git plugins/LumaSampleData
   ```
+- Fix permission
+  ```
+  sudo chown -R www-data:www-data src plugins
+  ```
 - Set env vars:
 
   | Var                 | Description                           | Example value                    |
@@ -25,6 +29,8 @@
   ```shell
   # Update compose minimum stability in order to be able to require not released sdk package.
   docker compose exec shopware composer config minimum-stability dev
+  # Composer install
+  docker compose exec shopware composer install
   # Refresh plugin list from source
   docker compose exec shopware bin/console plugin:refresh 
   # Install magento sample data (it can take several minutes)

compose.override.yml

@@ -3,7 +3,12 @@ services:
     extra_hosts:
       - ${GALLY_SERVER_NAME:-gally.localhost}:host-gateway
     environment:
+      - APP_ENV=prod
       - APP_DEBUG=0
+      - APP_URL=https://${SERVER_NAME}/
+      - TRUSTED_PROXIES=0.0.0.0/0
+      - TRUSTED_HOSTS=^${SERVER_NAME}$
+      - COMPOSER_HOME=$HOME/.config/composer
       - SYMFONY_DEPRECATIONS_HELPER=disabled
       - XDEBUG_ENABLED=1
       - XDEBUG_REMOTE_HOST=172.17.0.1

compose.yml

@@ -6,9 +6,10 @@ services:
             - target: 433
             - target: 80
         volumes:
-            - ./messenger.yaml:/var/www/html/config/packages/messenger.yaml
+            - ./src:/var/www/html:rw,cached
             - ./plugins:/var/www/html/custom/plugins:rw,cached
-            - src_data:/var/www/html/
+            - jwt:/var/www/html/config/jwt:rw,cached
+            - var:/var/www/html/var:rw,cached
             - db_data:/var/lib/mysql
         labels:
             - traefik.enable=true
@@ -22,4 +23,5 @@ services:
 
 volumes:
     db_data:
-    src_data:
+    jwt:
+    var:

src/.env

@@ -0,0 +1,46 @@
+
+###> shopware/core ###
+
+
+APP_SECRET=c91f5ee05ba237ee7e48ca177dd3ea81
+INSTANCE_ID=5b0a513bbafcaa5bd261b387e989d5bd
+BLUE_GREEN_DEPLOYMENT=0
+
+# With Shopware 6.4.17.0 the MAILER_DSN variable will be used in this template instead of MAILER_URL
+
+###< shopware/core ###
+
+###> symfony/messenger ###
+# Choose one of the transports below
+# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
+# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
+# doctrine://default?auto_setup=0
+###< symfony/messenger ###
+
+###> symfony/mailer ###
+# MAILER_DSN=null://null
+###< symfony/mailer ###
+
+###> symfony/lock ###
+# Choose one of the stores below
+# postgresql+advisory://db_user:db_password@localhost/db_name
+LOCK_DSN=flock
+###< symfony/lock ###
+
+###> shopware/elasticsearch ###
+OPENSEARCH_URL=http://localhost:9200
+SHOPWARE_ES_ENABLED=0
+SHOPWARE_ES_INDEXING_ENABLED=0
+SHOPWARE_ES_INDEX_PREFIX=sw
+SHOPWARE_ES_THROW_EXCEPTION=1
+###< shopware/elasticsearch ###
+
+###> shopware/storefront ###
+PROXY_URL=http://localhost
+SHOPWARE_HTTP_CACHE_ENABLED=1
+SHOPWARE_HTTP_DEFAULT_TTL=7200
+###< shopware/storefront ###
+APP_ENV=dev
+APP_URL=http://localhost
+DATABASE_URL=mysql://root:root@127.0.0.1:3306/shopware
+MAILER_DSN=smtp://127.0.0.1:1025

src/.gitignore

@@ -0,0 +1,20 @@
+/.idea
+/vendor/
+
+###> shopware/core ###
+.env.local
+.env.local.php
+.env.*.local
+/public/bundles/*
+/public/media/*
+/public/theme/*
+/public/thumbnail/*
+/public/sitemap/*
+/files/*
+!/files/.htaccess
+/var/*
+!/var/.htaccess
+/auth.json
+/install.lock
+public/asset-manifest.json
+###< shopware/core ###

src/.htaccess

@@ -0,0 +1,14 @@
+DirectoryIndex index.html index.php
+
+<IfModule mod_negotiation.c>
+    Options -MultiViews
+</IfModule>
+
+<IfModule mod_alias.c>
+    # Restrict access to VCS directories
+    RedirectMatch 404 /\\.(svn|git|hg|bzr|cvs)(/|$)
+
+    # Restrict access to root folder files
+    RedirectMatch 404 /(composer\.(json|lock|phar)|README\.md|\.gitignore|.*\.dist|\.env.*)$
+</IfModule>
+

src/bin/.htaccess

@@ -0,0 +1,11 @@
+<Files ~ ".*">
+    # Deny all requests from Apache 2.4+.
+    <IfModule mod_authz_core.c>
+          Require all denied
+    </IfModule>
+
+    # Deny all requests from Apache 2.0-2.2.
+    <IfModule !mod_authz_core.c>
+        Deny from all
+    </IfModule>
+</Files>

src/bin/build-administration.sh

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+unset CDPATH
+CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
+
+export PROJECT_ROOT="${PROJECT_ROOT:-"$(dirname "$CWD")"}"
+export ENV_FILE=${ENV_FILE:-"${PROJECT_ROOT}/.env"}
+export NPM_CONFIG_FUND=false
+export NPM_CONFIG_AUDIT=false
+export NPM_CONFIG_UPDATE_NOTIFIER=false
+
+# shellcheck source=functions.sh
+source "${PROJECT_ROOT}/bin/functions.sh"
+
+curenv=$(declare -p -x)
+
+load_dotenv "$ENV_FILE"
+
+# Restore environment variables set globally
+set -o allexport
+eval "$curenv"
+set +o allexport
+
+set -euo pipefail
+
+export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+export DISABLE_ADMIN_COMPILATION_TYPECHECK=true
+export PROJECT_ROOT="${PROJECT_ROOT:-"$(dirname "$CWD")"}"
+
+if [[ -e "${PROJECT_ROOT}/vendor/shopware/platform" ]]; then
+    ADMIN_ROOT="${ADMIN_ROOT:-"${PROJECT_ROOT}/vendor/shopware/platform/src/Administration"}"
+else
+    ADMIN_ROOT="${ADMIN_ROOT:-"${PROJECT_ROOT}/vendor/shopware/administration"}"
+fi
+
+BIN_TOOL="${CWD}/console"
+
+if [[ ${CI:-""} ]]; then
+    BIN_TOOL="${CWD}/ci"
+
+    if [[ ! -x "$BIN_TOOL" ]]; then
+        chmod +x "$BIN_TOOL"
+    fi
+fi
+
+# build admin
+[[ ${SHOPWARE_SKIP_BUNDLE_DUMP:-""} ]] || "${BIN_TOOL}" bundle:dump
+"${BIN_TOOL}" feature:dump || true
+
+if [[ $(command -v jq) ]]; then
+    OLDPWD=$(pwd)
+    cd "$PROJECT_ROOT" || exit
+
+    jq -c '.[]' "var/plugins.json" | while read -r config; do
+        srcPath=$(echo "$config" | jq -r '(.basePath + .administration.path)')
+
+        # the package.json files are always one upper
+        path=$(dirname "$srcPath")
+        name=$(echo "$config" | jq -r '.technicalName' )
+
+        skippingEnvVarName="SKIP_$(echo "$name" | sed -e 's/\([a-z]\)/\U\1/g' -e 's/-/_/g')"
+
+        if [[ ${!skippingEnvVarName:-""} ]]; then
+            continue
+        fi
+
+        if [[ -f "$path/package.json" && ! -d "$path/node_modules" && $name != "administration" ]]; then
+            echo "=> Installing npm dependencies for ${name}"
+
+            npm install --prefix "$path" --no-audit --prefer-offline
+        fi
+    done
+    cd "$OLDPWD" || exit
+else
+    echo "Cannot check extensions for required npm installations as jq is not installed"
+fi
+
+(cd "${ADMIN_ROOT}"/Resources/app/administration && npm install --prefer-offline --production)
+
+# Dump entity schema
+if [[ -z "${SHOPWARE_SKIP_ENTITY_SCHEMA_DUMP:-""}" ]] && [[ -f "${ADMIN_ROOT}"/Resources/app/administration/scripts/entitySchemaConverter/entity-schema-converter.ts ]]; then
+  mkdir -p "${ADMIN_ROOT}"/Resources/app/administration/test/_mocks_
+  "${BIN_TOOL}" -e prod framework:schema -s 'entity-schema' "${ADMIN_ROOT}"/Resources/app/administration/test/_mocks_/entity-schema.json
+  (cd "${ADMIN_ROOT}"/Resources/app/administration && npm run convert-entity-schema)
+fi
+
+(cd "${ADMIN_ROOT}"/Resources/app/administration && npm run build)
+[[ ${SHOPWARE_SKIP_ASSET_COPY:-""} ]] ||"${BIN_TOOL}" assets:install

src/bin/build-js.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+BIN_DIR="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
+
+set -euo pipefail
+
+
+if [[ -e "${BIN_DIR}/build-administration.sh" ]]; then
+  "${BIN_DIR}/build-administration.sh"
+fi
+
+if [[ -e "${BIN_DIR}/build-storefront.sh" ]]; then
+  "${BIN_DIR}/build-storefront.sh"
+fi

src/bin/build-storefront.sh

@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+unset CDPATH
+CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
+
+set -euo pipefail
+
+export PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+export PROJECT_ROOT="${PROJECT_ROOT:-"$(dirname "$CWD")"}"
+export NPM_CONFIG_FUND=false
+export NPM_CONFIG_AUDIT=false
+export NPM_CONFIG_UPDATE_NOTIFIER=false
+
+if [[ -e "${PROJECT_ROOT}/vendor/shopware/platform" ]]; then
+    STOREFRONT_ROOT="${STOREFRONT_ROOT:-"${PROJECT_ROOT}/vendor/shopware/platform/src/Storefront"}"
+else
+    STOREFRONT_ROOT="${STOREFRONT_ROOT:-"${PROJECT_ROOT}/vendor/shopware/storefront"}"
+fi
+
+BIN_TOOL="${CWD}/console"
+
+if [[ ${CI:-""} ]]; then
+    BIN_TOOL="${CWD}/ci"
+
+    if [[ ! -x "$BIN_TOOL" ]]; then
+        chmod +x "$BIN_TOOL"
+    fi
+fi
+
+# build storefront
+[[ ${SHOPWARE_SKIP_BUNDLE_DUMP:-""} ]] || "${BIN_TOOL}" bundle:dump
+[[ ${SHOPWARE_SKIP_FEATURE_DUMP:-""} ]] || "${BIN_TOOL}" feature:dump
+
+if [[ $(command -v jq) ]]; then
+    OLDPWD=$(pwd)
+    cd "$PROJECT_ROOT" || exit
+
+    jq -c '.[]' "var/plugins.json" | while read -r config; do
+        srcPath=$(echo "$config" | jq -r '(.basePath + .storefront.path)')
+
+        # the package.json files are always one upper
+        path=$(dirname "$srcPath")
+        name=$(echo "$config" | jq -r '.technicalName' )
+
+        skippingEnvVarName="SKIP_$(echo "$name" | sed -e 's/\([a-z]\)/\U\1/g' -e 's/-/_/g')"
+
+        if [[ ${!skippingEnvVarName:-""} ]]; then
+            continue
+        fi
+
+        if [[ -f "$path/package.json" && ! -d "$path/node_modules" && $name != "storefront" ]]; then
+            echo "=> Installing npm dependencies for ${name}"
+
+            npm install --prefix "$path" --prefer-offline
+        fi
+    done
+    cd "$OLDPWD" || exit
+else
+    echo "Cannot check extensions for required npm installations as jq is not installed"
+fi
+
+npm --prefix "${STOREFRONT_ROOT}"/Resources/app/storefront install --prefer-offline --production
+node "${STOREFRONT_ROOT}"/Resources/app/storefront/copy-to-vendor.js
+npm --prefix "${STOREFRONT_ROOT}"/Resources/app/storefront run production
+[[ ${SHOPWARE_SKIP_ASSET_COPY:-""} ]] ||"${BIN_TOOL}" assets:install
+[[ ${SHOPWARE_SKIP_THEME_COMPILE:-""} ]] || "${BIN_TOOL}" theme:compile --active-only
+
+if ! [ "${1:-default}" = "--keep-cache" ]; then
+    "${BIN_TOOL}" cache:clear
+fi