Skip to content

MAGECLOUD-3441: [Cloud Docker] Resolve Problem with SCD on Build Phas… #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 24, 2019
Merged

MAGECLOUD-3441: [Cloud Docker] Resolve Problem with SCD on Build Phas… #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc06f70
MAGECLOUD-3441: [Cloud Docker] Resolve Problem with SCD on Build Phas…
shiftedreality Apr 18, 2019
2d83409
MAGECLOUD-3441: [Cloud Docker] Resolve Problem with SCD on Build Phas…
shiftedreality Apr 18, 2019
5a7fd53
MAGECLOUD-3441: [Cloud Docker] Resolve Problem with SCD on Build Phas…
shiftedreality Apr 24, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
275 changes: 194 additions & 81 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions data/php-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ENV PHP_MEMORY_LIMIT 2G
ENV PHP_ENABLE_XDEBUG false
ENV MAGENTO_ROOT /var/www/magento
ENV DEBUG false
ENV MAGENTO_RUN_MODE production

ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
Expand Down
22 changes: 17 additions & 5 deletions data/php-cli/bin/cloud-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Cleaning directories."

rm -rf $MAGENTO_ROOT/setup/*
rm -rf $MAGENTO_ROOT/vendor/*
rm -rf $MAGENTO_ROOT/generated/*
fi

echo "Installing dependencies."

composer --working-dir=$MAGENTO_ROOT install --no-suggest --no-ansi --no-interaction --no-progress --prefer-dist

echo "Building Magento Cloud..."
echo "Running \"build\" hook."

$ECE_COMMAND build

echo "Fixing file permissions..."
if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Fixing file permissions."

find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
fi

echo "Building complete"
echo "Building complete."
7 changes: 3 additions & 4 deletions data/php-cli/bin/cloud-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

echo "Deploying Magento Cloud..."
echo "Running \"deploy\" hook."

$ECE_COMMAND deploy

echo "Post-deploy..."
echo "Running \"post-deploy\" hook."

$ECE_COMMAND post-deploy

echo "Deployment finished"
echo "Installation complete"
echo "Deployment finished."
2 changes: 0 additions & 2 deletions data/php-cli/bin/ece-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

ECE_COMMAND="$MAGENTO_ROOT/vendor/bin/ece-tools"

chmod +x $ECE_COMMAND

exec $ECE_COMMAND "$@"
1 change: 1 addition & 0 deletions php/7.0-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ENV PHP_MEMORY_LIMIT 2G
ENV PHP_ENABLE_XDEBUG false
ENV MAGENTO_ROOT /var/www/magento
ENV DEBUG false
ENV MAGENTO_RUN_MODE production

ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
Expand Down
22 changes: 17 additions & 5 deletions php/7.0-cli/bin/cloud-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Cleaning directories."

rm -rf $MAGENTO_ROOT/setup/*
rm -rf $MAGENTO_ROOT/vendor/*
rm -rf $MAGENTO_ROOT/generated/*
fi

echo "Installing dependencies."

composer --working-dir=$MAGENTO_ROOT install --no-suggest --no-ansi --no-interaction --no-progress --prefer-dist

echo "Building Magento Cloud..."
echo "Running \"build\" hook."

$ECE_COMMAND build

echo "Fixing file permissions..."
if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Fixing file permissions."

find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
fi

echo "Building complete"
echo "Building complete."
7 changes: 3 additions & 4 deletions php/7.0-cli/bin/cloud-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

echo "Deploying Magento Cloud..."
echo "Running \"deploy\" hook."

$ECE_COMMAND deploy

echo "Post-deploy..."
echo "Running \"post-deploy\" hook."

$ECE_COMMAND post-deploy

echo "Deployment finished"
echo "Installation complete"
echo "Deployment finished."
2 changes: 0 additions & 2 deletions php/7.0-cli/bin/ece-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

ECE_COMMAND="$MAGENTO_ROOT/vendor/bin/ece-tools"

chmod +x $ECE_COMMAND

exec $ECE_COMMAND "$@"
1 change: 1 addition & 0 deletions php/7.1-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ENV PHP_MEMORY_LIMIT 2G
ENV PHP_ENABLE_XDEBUG false
ENV MAGENTO_ROOT /var/www/magento
ENV DEBUG false
ENV MAGENTO_RUN_MODE production

ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
Expand Down
22 changes: 17 additions & 5 deletions php/7.1-cli/bin/cloud-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Cleaning directories."

rm -rf $MAGENTO_ROOT/setup/*
rm -rf $MAGENTO_ROOT/vendor/*
rm -rf $MAGENTO_ROOT/generated/*
fi

echo "Installing dependencies."

composer --working-dir=$MAGENTO_ROOT install --no-suggest --no-ansi --no-interaction --no-progress --prefer-dist

echo "Building Magento Cloud..."
echo "Running \"build\" hook."

$ECE_COMMAND build

echo "Fixing file permissions..."
if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Fixing file permissions."

find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
fi

echo "Building complete"
echo "Building complete."
7 changes: 3 additions & 4 deletions php/7.1-cli/bin/cloud-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

echo "Deploying Magento Cloud..."
echo "Running \"deploy\" hook."

$ECE_COMMAND deploy

echo "Post-deploy..."
echo "Running \"post-deploy\" hook."

$ECE_COMMAND post-deploy

echo "Deployment finished"
echo "Installation complete"
echo "Deployment finished."
2 changes: 0 additions & 2 deletions php/7.1-cli/bin/ece-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

ECE_COMMAND="$MAGENTO_ROOT/vendor/bin/ece-tools"

chmod +x $ECE_COMMAND

exec $ECE_COMMAND "$@"
1 change: 1 addition & 0 deletions php/7.2-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ ENV PHP_MEMORY_LIMIT 2G
ENV PHP_ENABLE_XDEBUG false
ENV MAGENTO_ROOT /var/www/magento
ENV DEBUG false
ENV MAGENTO_RUN_MODE production

ADD etc/php-xdebug.ini /usr/local/etc/php/conf.d/zz-xdebug-settings.ini
ADD etc/mail.ini /usr/local/etc/php/conf.d/zz-mail.ini
Expand Down
22 changes: 17 additions & 5 deletions php/7.2-cli/bin/cloud-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,27 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Cleaning directories."

rm -rf $MAGENTO_ROOT/setup/*
rm -rf $MAGENTO_ROOT/vendor/*
rm -rf $MAGENTO_ROOT/generated/*
fi

echo "Installing dependencies."

composer --working-dir=$MAGENTO_ROOT install --no-suggest --no-ansi --no-interaction --no-progress --prefer-dist

echo "Building Magento Cloud..."
echo "Running \"build\" hook."

$ECE_COMMAND build

echo "Fixing file permissions..."
if [ "$MAGENTO_RUN_MODE" == "production" ]; then
echo "Fixing file permissions."

find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
find $MAGENTO_ROOT/pub -type f -exec chmod 664 {} \;
find $MAGENTO_ROOT/pub -type d -exec chmod 775 {} \;
fi

echo "Building complete"
echo "Building complete."
7 changes: 3 additions & 4 deletions php/7.2-cli/bin/cloud-deploy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,12 @@ set -e
MAGENTO_COMMAND="magento-command"
ECE_COMMAND="ece-command"

echo "Deploying Magento Cloud..."
echo "Running \"deploy\" hook."

$ECE_COMMAND deploy

echo "Post-deploy..."
echo "Running \"post-deploy\" hook."

$ECE_COMMAND post-deploy

echo "Deployment finished"
echo "Installation complete"
echo "Deployment finished."
2 changes: 0 additions & 2 deletions php/7.2-cli/bin/ece-command
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@

ECE_COMMAND="$MAGENTO_ROOT/vendor/bin/ece-tools"

chmod +x $ECE_COMMAND

exec $ECE_COMMAND "$@"