Skip to content

Commit

Permalink
OXDEV-8759 Use parts as a submodule
Browse files Browse the repository at this point in the history
Signed-off-by: Anton Fedurtsya <[email protected]>
  • Loading branch information
Sieg committed Oct 16, 2024
1 parent 5abe7a6 commit b6f9a03
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "parts"]
path = parts
url = https://github.com/OXID-eSales/docker-eshop-sdk-recipe-parts
branch = master
21 changes: 7 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,20 @@ git clone https://github.com/OXID-eSales/docker-eshop-sdk-recipes recipes/oxid-e
./recipes/oxid-esales/shop/b-6.5.x-ce-dev/run.sh
```

## Synchronize parts
## Parts directory is a submodule

The ``parts`` directory is organized as a subtree component. It has its own repository for easier reuse between
The ``parts`` directory is used as a git submodule. It has its own repository for easier reuse between
different recipes.

Before manipulating the parts, navigate to this repository root and add parts repository link:
To pull the latest changes from parts repository and update the link, you can use the following commands by being in the current repository root:

```
git remote add parts https://github.com/OXID-eSales/docker-eshop-sdk-recipe-parts && git fetch parts
git submodule update --remote
git commit -am "Update parts submodule to latest"
```

To pull and merge the latest version of parts:
```
git subtree pull --prefix=parts parts master
```

To push your updated parts, first make a commit as regularly
```
git commit -a -m"some commit"
git subtree push --prefix=parts parts master
```
Be careful with the changes in the parts repository, as they may affect all **recipes** using it.
Also be careful with pushing changes to the parts repository, as it may affect all **repositories** using it.

## Multiserver configuration

Expand Down
1 change: 1 addition & 0 deletions parts
Submodule parts added at cc43cd

0 comments on commit b6f9a03

Please sign in to comment.