Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: markshust/docker-magento
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mattgrul/docker-magento
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 6 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 17, 2021

  1. Add Magento contributor setup

    Matt Walsh committed Jan 17, 2021
    Copy the full SHA
    c0e1d09 View commit details
  2. Contributor setup

    Matt Walsh committed Jan 17, 2021
    Copy the full SHA
    9391226 View commit details
  3. Set .idea untracked

    Matt Walsh committed Jan 17, 2021
    Copy the full SHA
    e25b772 View commit details
  4. Adding gitignore

    Matt Walsh committed Jan 17, 2021
    Copy the full SHA
    e20735e View commit details

Commits on Feb 6, 2021

  1. Copy the full SHA
    92c5426 View commit details

Commits on Feb 9, 2021

  1. Update onelinesetup repo URL

    Matt committed Feb 9, 2021
    Copy the full SHA
    6e9172d View commit details
Showing with 16 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +13 −0 lib/contributorsetup
  3. +1 −1 lib/onelinesetup
  4. +1 −1 lib/template
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
13 changes: 13 additions & 0 deletions lib/contributorsetup
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
DOMAIN=${1:-magento2.test}
VERSION=${2:-2.4.0}
EDITION=${3:-community}

curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash
git clone https://github.com/mattgrul/magento2.git src
git remote add upstream https://github.com/magento/magento2.git

echo "Your system password has been requested to add an entry to /etc/hosts..."
echo "127.0.0.1 ::1 $DOMAIN" | sudo tee -a /etc/hosts

bin/setup $DOMAIN
2 changes: 1 addition & 1 deletion lib/onelinesetup
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ DOMAIN=${1:-magento2.test}
VERSION=${2:-2.4.0}
EDITION=${3:-community}

curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash
curl -s https://raw.githubusercontent.com/mattgrul/docker-magento/master/lib/template | bash
bin/download $VERSION $EDITION

echo "Your system password has been requested to add an entry to /etc/hosts..."
2 changes: 1 addition & 1 deletion lib/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
git init -qqq
git remote add origin https://github.com/markshust/docker-magento
git remote add origin https://github.com/mattgrul/docker-magento
git fetch origin -qqq
git checkout origin/master -- compose
mv compose/* ./