Skip to content

Commit

Permalink
Add docker.io to more places
Browse files Browse the repository at this point in the history
  • Loading branch information
mathbunnyru committed Oct 19, 2023
1 parent 8142194 commit 00e591f
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 13 deletions.
8 changes: 4 additions & 4 deletions examples/openshift/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ The output will be similar to:
* With parameters:
* APPLICATION_NAME=notebook
* NOTEBOOK_IMAGE=jupyter/minimal-notebook:latest
* NOTEBOOK_IMAGE=docker.io/jupyter/minimal-notebook:latest
* NOTEBOOK_PASSWORD=ded4d7cada554aa48e0db612e1ed1080 # generated
--> Creating resources ...
Expand All @@ -69,7 +69,7 @@ When no template parameters are provided, the name of the deployed notebook will
The image used will be:

```lang-none
jupyter/minimal-notebook:latest
docker.io/jupyter/minimal-notebook:latest
```

A password you can use when accessing the notebook will be auto generated and is displayed in the output from running `oc new-app`.
Expand Down Expand Up @@ -102,7 +102,7 @@ To override the name for the notebook, the image used, and the password, you can
```bash
oc new-app --template jupyter-notebook \
--param APPLICATION_NAME=mynotebook \
--param NOTEBOOK_IMAGE=jupyter/scipy-notebook:latest \
--param NOTEBOOK_IMAGE=docker.io/jupyter/scipy-notebook:latest \
--param NOTEBOOK_PASSWORD=mypassword
```

Expand Down Expand Up @@ -213,7 +213,7 @@ you can use the name of the image stream for the image name, including any image
This can be illustrated by first importing an image into the OpenShift project.

```bash
oc import-image jupyter/datascience-notebook:latest --confirm
oc import-image docker.io/jupyter/datascience-notebook:latest --confirm
```

Then deploy it using the name of the image stream created.
Expand Down
3 changes: 1 addition & 2 deletions examples/openshift/templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
{
"name": "NOTEBOOK_IMAGE",
"value": "jupyter/minimal-notebook:latest",
"value": "docker.io/jupyter/minimal-notebook:latest",
"required": true
},
{
Expand Down Expand Up @@ -85,7 +85,6 @@
"--no-browser",
"--ip=0.0.0.0"
],

"ports": [
{
"containerPort": 8888,
Expand Down
6 changes: 3 additions & 3 deletions examples/source-to-image/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ s2i build \
--scripts-url https://raw.githubusercontent.com/jupyter/docker-stacks/main/examples/source-to-image \
--context-dir docs/source/examples/Notebook \
https://github.com/jupyter/notebook \
jupyter/minimal-notebook:latest \
docker.io/jupyter/minimal-notebook:latest \
notebook-examples
```

This example command will pull down the Git repository <https://github.com/jupyter/notebook>
and build the image `notebook-examples` using the files contained in the `docs/source/examples/Notebook` directory of that Git repository.
The base image which the files will be combined with is `jupyter/minimal-notebook:latest`, but you can specify any of the Jupyter Project `docker-stacks` images as the base image.
The base image which the files will be combined with is `docker.io/jupyter/minimal-notebook:latest`, but you can specify any of the Jupyter Project `docker-stacks` images as the base image.

The resulting image from running the command can be seen by running `docker images` command:

Expand Down Expand Up @@ -147,7 +147,7 @@ oc new-app --template jupyter-notebook-quickstart \
--param APPLICATION_NAME=notebook-examples \
--param GIT_REPOSITORY_URL=https://github.com/jupyter/notebook \
--param CONTEXT_DIR=docs/source/examples/Notebook \
--param BUILDER_IMAGE=jupyter/minimal-notebook:latest \
--param BUILDER_IMAGE=docker.io/jupyter/minimal-notebook:latest \
--param NOTEBOOK_PASSWORD=mypassword
```

Expand Down
5 changes: 2 additions & 3 deletions examples/source-to-image/templates.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
},
{
"name": "BUILDER_IMAGE",
"value": "jupyter/minimal-notebook:latest",
"value": "docker.io/jupyter/minimal-notebook:latest",
"required": true
},
{
Expand Down Expand Up @@ -125,7 +125,7 @@
},
{
"name": "BUILDER_IMAGE",
"value": "jupyter/minimal-notebook:latest",
"value": "docker.io/jupyter/minimal-notebook:latest",
"required": true
},
{
Expand Down Expand Up @@ -279,7 +279,6 @@
"--no-browser",
"--ip=0.0.0.0"
],

"ports": [
{
"containerPort": 8888,
Expand Down
2 changes: 1 addition & 1 deletion tagging/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ The main purpose of the source code in this folder is to properly tag all the im
These two processes are closely related, so the source code is widely reused.

A basic example of a tag is a `python` version tag.
For example, an image `jupyter/base-notebook` with `python 3.10.5` will have a tag `jupyter/base-notebook:python-3.10.5`.
For example, an image `jupyter/base-notebook` with `python 3.10.5` will have a full image name `docker.io/jupyter/base-notebook:python-3.10.5`.
This tag (and all the other tags) are pushed to Docker Hub.

Manifest is a description of some important part of the image in a `markdown`.
Expand Down

0 comments on commit 00e591f

Please sign in to comment.