Skip to content
This repository was archived by the owner on Nov 6, 2021. It is now read-only.

Commit 16f51e4

Browse files
author
Florian Horn
committed
Added missing folder to development environment and build script
1 parent 89f3a35 commit 16f51e4

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@ OUTPUT="${DEST}/allindata_contentfuzzyfyr.zip"
353353
##
354354
## Cleanup
355355
##
356+
info "CLEANUP"
356357
if [ -e "${OUTPUT}" ]; then
357358
rm "${OUTPUT}"
358359
fi
@@ -373,11 +374,14 @@ rm -rf "${DEST}"/*
373374
## Update dependencies
374375
## Based upon PHP 7.0
375376
##
377+
info "UPDATING DEPENDENCIES"
376378
docker run -v "${SRC}":/www -v ~/.composer:/root/.composer --rm danieldent/php-7.1-composer:latest bash -c 'apt-get install -y libfreetype6-dev libjpeg62-turbo-dev libmcrypt-dev libpng12-dev libxslt-dev && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && docker-php-ext-install gd mcrypt xsl && cd /www && composer update'
377379

378380
##
379381
## Prepare important files
380382
##
383+
info "Prepare important files"
384+
cp -pPR "${SRC}/Api" "${TMP}/Api"
381385
cp -pPR "${SRC}/Console" "${TMP}/Console"
382386
cp -pPR "${SRC}/docs" "${TMP}/docs"
383387
cp -pPR "${SRC}/etc" "${TMP}/etc"
@@ -396,11 +400,13 @@ cp -pP "${SRC}/registration.php" "${TMP}/registration.php"
396400
##
397401
## Validation for M2EQB
398402
##
403+
info "Validation for M2EQB"
399404
docker run -v "${TMP}":/www -v "${EQP}":/m2eqb -v ~/.composer:/root/.composer --rm danieldent/php-7.1-composer:latest bash -c 'cd /m2eqb && vendor/bin/phpcs /www --standard=MEQP2 --severity=10 --extensions=php,phtml'
400405

401406
##
402407
## Build package
403408
##
409+
info "Build package"
404410
cd "${TMP}"
405411
zip -r "${OUTPUT}" .
406412

@@ -412,5 +418,6 @@ fi
412418
##
413419
## Validate package
414420
##
421+
info "Validate package"
415422
cd "${CURDIR}"
416423
php -f validate_m2_package.php "${OUTPUT}"

docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ services:
1111
- phpfpm
1212
volumes: &appvolumes
1313
- appdata:/var/www/html
14+
- ./Api:/var/www/html/app/code/AllInData/ContentFuzzyfyr/Api:cached
1415
- ./Console:/var/www/html/app/code/AllInData/ContentFuzzyfyr/Console:cached
1516
- ./etc:/var/www/html/app/code/AllInData/ContentFuzzyfyr/etc
1617
- ./Model:/var/www/html/app/code/AllInData/ContentFuzzyfyr/Model:cached
@@ -52,7 +53,7 @@ services:
5253
env_file: env/mysql.env
5354

5455
setup:
55-
image: mageinferno/magento2-php:7.0-fpm-1
56+
image: mageinferno/magento2-php:7.1-fpm-1
5657
command: /usr/local/bin/mage-setup
5758
links:
5859
- db

0 commit comments

Comments
 (0)