Skip to content
Permalink
Browse files

Merge branch 'update' - bug fix and update Magento

  • Loading branch information...
JedMeister committed Feb 7, 2019
2 parents 81e9b8c + 1c48da0 commit 15db67f24da2e5ba8061715d11054875033edabc
Showing with 20 additions and 11 deletions.
  1. +12 −0 changelog
  2. +3 −1 conf.d/main
  3. +5 −10 overlay/usr/lib/inithooks/bin/magento.py
@@ -1,3 +1,15 @@
turnkey-magento-15.2 (1) turnkey; urgency=low

* Upgrade to latest upstream source 2.2.x version - v2.2.7.

* Reduce inithook text relating to Magento keys, moved to doc page.
- closes #1299.

* Tweak conf script to skip release candidate versions and stay on v2.2.x.
v2.3.x requires PHP7.1+

-- Jeremy Davis <jeremy@turnkeylinux.com> Thu, 07 Feb 2019 14:19:54 +1100

turnkey-magento-15.1 (1) turnkey; urgency=low

* Upgrade to latest upstream source version - v2.2.6.
@@ -2,7 +2,10 @@

# get latest stable version from GH releases
GH_API=https://api.github.com/repos/magento/magento2/releases
# ignore release candidates & v2.3.x (for now - requires PHP7.1+)
VER=$(curl -s $GH_API |grep -oP '"tag_name": "\K(.*)(?=")' \
| grep -vi rc \
| grep -v ^2\.3\. \
| sort --version-sort | tail -1)

URL=https://github.com/magento/magento2
@@ -88,4 +91,3 @@ $MYSQL_BATCH --execute "USE $DB_NAME; UPDATE adminnotification_inbox SET is_read
# stop mysql
service mysql stop


@@ -36,17 +36,12 @@ def usage(s=None):

DEFAULT_DOMAIN="www.example.com"
AUTHKEY_MESSAGE="""
Please enter your Magento Marketplace account %s key here (optional). This is needed for upgrading the Magento installation through Composer.
Please enter your Magento Marketplace account %s key here (optional). This is needed for upgrading the Magento installation via commandline. It is also required for third party integrations.
The list of your account keys can be found at:
https://marketplace.magento.com/customer/accessKeys/list
Keys can be added later if not provided now.
Alternatively, you can skip this and configure your keys in the finished TurnKey Magento installation by navigating to "System -> Enable Composer updates" in the sidebar.
You can also save the keys by invoking 'composer update' in /var/www/magento or by creating an auth.json file manually.
Please see this URL for more information:
https://www.turnkeylinux.org/magento
For more information, please see:
https://www.turnkeylinux.org/docs/magento
"""

@@ -122,7 +117,7 @@ def main():
if privkey == "DEFAULT":
privkey = "SKIP"

if not pubkey:
if privkey and not pubkey:
if 'd' not in locals():
d = Dialog('TurnKey Linux - First boot configuration')

0 comments on commit 15db67f

Please sign in to comment.
You can’t perform that action at this time.