Skip to content

Commit 1f1fab0

Browse files
authored
Merge pull request #1438 from rgaiacs/1437-avoid-jupyter-repo2docker
Avoid jupyter-repo2docker in the commad line
2 parents 3899104 + 2c25648 commit 1f1fab0

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

docs/source/cli.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
`repo2docker` is called with this command:
44

55
```
6-
jupyter-repo2docker <source-repository>
6+
repo2docker <source-repository>
77
```
88

99
where `<source-repository>` is a repository in one of [the supported repository providers](#repository-providers).
@@ -12,7 +12,7 @@ For example, the following command will build an image of Peter Norvig's
1212
[Pytudes] repository:
1313

1414
```
15-
jupyter-repo2docker https://github.com/norvig/pytudes
15+
repo2docker https://github.com/norvig/pytudes
1616
```
1717

1818
Building the image may take a few minutes.
@@ -35,7 +35,7 @@ dependencies and contents of the source repository in the built image.
3535
To debug the container image being built, pass the `--debug` parameter:
3636

3737
> ```bash
38-
> jupyter-repo2docker --debug https://github.com/norvig/pytudes
38+
> repo2docker --debug https://github.com/norvig/pytudes
3939
> ```
4040
4141
This will print the generated `Dockerfile`, build it, and run it.
@@ -44,7 +44,7 @@ To see the generated `Dockerfile` without actually building it, pass `--no-build
4444
This `Dockerfile` output is for **debugging purposes** of `repo2docker` only - it can not be used by Docker directly.
4545
4646
> ```bash
47-
> jupyter-repo2docker --no-build --debug https://github.com/norvig/pytudes
47+
> repo2docker --no-build --debug https://github.com/norvig/pytudes
4848
> ```
4949
5050
## Build from a branch, commit or tag
@@ -53,7 +53,7 @@ To build a particular branch and commit, use the argument `--ref` and
5353
specify the `branch-name` or `commit-hash`. For example:
5454
5555
```
56-
jupyter-repo2docker --ref 9ced85dd9a84859d0767369e58f33912a214a3cf https://github.com/norvig/pytudes
56+
repo2docker --ref 9ced85dd9a84859d0767369e58f33912a214a3cf https://github.com/norvig/pytudes
5757
```
5858
5959
:::{tip}
@@ -70,7 +70,7 @@ flag for each variable that you want to define.
7070
For example:
7171

7272
```bash
73-
jupyter-repo2docker -e VAR1=val1 -e VAR2=val2 ...
73+
repo2docker -e VAR1=val1 -e VAR2=val2 ...
7474
```
7575

7676
You can also configure environment variables for all users of a repository using the
@@ -81,7 +81,7 @@ You can also configure environment variables for all users of a repository using
8181
## Command-line API
8282

8383
```{autoprogram} repo2docker.__main__:argparser
84-
:prog: jupyter-repo2docker
84+
:prog: repo2docker
8585
```
8686

8787
[pytudes]: https://github.com/norvig/pytudes

docs/source/contribute/tasks.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,13 @@ automates this test.
165165
```bash
166166
#! /bin/bash -e
167167

168-
current_version=$(jupyter-repo2docker --version | sed s@+@-@)
168+
current_version=$(repo2docker --version | sed s@+@-@)
169169
echo "Comparing $(pwd) (local $current_version vs. $R2D_COMPARE_TO)"
170170
basename="dockerfilediff"
171171

172172
diff_r2d_dockerfiles_with_version () {
173-
docker run --rm -t -v "$(pwd)":"$(pwd)" --user 1000 jupyterhub/repo2docker:"$1" jupyter-repo2docker --no-build --debug "$(pwd)" &> "$basename"."$1"
174-
jupyter-repo2docker --no-build --debug "$(pwd)" &> "$basename"."$current_version"
173+
docker run --rm -t -v "$(pwd)":"$(pwd)" --user 1000 jupyterhub/repo2docker:"$1" repo2docker --no-build --debug "$(pwd)" &> "$basename"."$1"
174+
repo2docker --no-build --debug "$(pwd)" &> "$basename"."$current_version"
175175

176176
# remove first line logging the path
177177
sed -i '/^\[Repo2Docker\]/d' "$basename"."$1"

docs/source/design.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The use cases for `repo2docker` which drive most design decisions are:
1616
1. Automated image building used by projects like
1717
[BinderHub](http://github.com/jupyterhub/binderhub)
1818
2. Manual image building and running the image from the command line client,
19-
`jupyter-repo2docker`, by users interactively on their workstations
19+
`repo2docker`, by users interactively on their workstations
2020

2121
## Deterministic output
2222

docs/source/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ In short, `repo2docker` is a tool to reproducibly build, run, and deploy these u
3737
When you call `repo2docker` like so:
3838

3939
```
40-
jupyter-repo2docker <source-repository>
40+
repo2docker <source-repository>
4141
```
4242

4343
It performs these steps:

docs/source/start.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This tutorial guides you through installing `repo2docker` and building your firs
66

77
## Install `repo2docker`
88

9-
repo2docker requires Python 3.6 or above on Linux and macOS.
9+
`repo2docker` requires Python 3.6 or above on Linux and macOS.
1010

1111
:::{admonition} Windows support is experimental
1212

@@ -23,6 +23,10 @@ Recent versions of Docker are recommended.
2323

2424
### Install `repo2docker` with `pip`
2525

26+
```{warning}
27+
The name of the package on [PyPI](https://pypi.org/) is [`jupyter-repo2docker`](https://pypi.org/project/jupyter-repo2docker/) instead of `repo2docker`.
28+
```
29+
2630
We recommend installing `repo2docker` with the `pip` tool:
2731

2832
```

docs/source/use/repository.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ by `repo2docker` to see how to configure the build process.
3333
In each case you can build from these repository sources like so:
3434

3535
```bash
36-
jupyter-repo2docker <repository-reference>
36+
repo2docker <repository-reference>
3737
```
3838

3939
## Supported version control systems

0 commit comments

Comments
 (0)