Skip to content

Commit

Permalink
Do not use own git-aggregator fork.
Browse files Browse the repository at this point in the history
Now acsone/git-aggregator#6 and acsone/git-aggregator#7 are merged.

However, we still have to use a development version, so we hash-pin it.
  • Loading branch information
yajo committed Jan 24, 2017
1 parent e8a41a7 commit 5916014
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ RUN ln /usr/local/bin/wkhtmltoimage /usr/local/bin/wkhtmltopdf

# Patched git-aggregator
RUN apk add --no-cache git
RUN pip install --no-cache-dir https:/Tecnativa/git-aggregator/archive/master-depth.zip
RUN pip install --no-cache-dir https:/acsone/git-aggregator/archive/bdfdf05a7e903b06c201f163161053a924330bed.zip

# WDB debugger
RUN pip install --no-cache-dir wdb
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -265,10 +265,9 @@ I told you, this image is opinionated. :wink:
We found this one to be the most useful tool for downlading code, merging it
and placing it somewhere.

We use [our own fork](https:/Tecnativa/git-aggregator) because it
is even better! (Until they merge some PRs and publish a new version).

Actually, because [it allows you to choose a `--depth` when pulling
We will use
[a development version](https:/acsone/git-aggregator/tree/bdfdf05a7e903b06c201f163161053a924330bed)
until the stable one [allows you to choose a `--depth` when pulling
images](https:/acsone/git-aggregator/pull/7), and [fetches only the
required remotes](https:/acsone/git-aggregator/pull/6).

Expand Down

0 comments on commit 5916014

Please sign in to comment.