Skip to content

Commit

Permalink
replace docker hub links with mcr links in our docs (#338)
Browse files Browse the repository at this point in the history
* replace docker hub links qwith mcr links in our docs

* remove doc changes as a trigger for validation builds

* undo trigger changes for validation build

* test without git checkout

* add back checkout step
  • Loading branch information
arroyc authored Sep 6, 2019
1 parent 489b7c6 commit 2c52ada
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
7 changes: 2 additions & 5 deletions doc/architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ The build image manifest is at
[/images/build/Dockerfile](../images/build/Dockerfile). It is built and
published via the Microsoft Container Registry (MCR) ([info][]) as
`mcr.microsoft.com/oryx/build` and syndicated to Docker Hub as
[index.docker.io/oryxprod/build:latest][]. Pull with `docker pull
[https://hub.docker.com/_/microsoft-oryx-images][]. Pull with `docker pull
mcr.microsoft.com/oryx/build:latest`.

[info]: https://azure.microsoft.com/en-us/blog/microsoft-syndicates-container-catalog/
[index.docker.io/oryxprod/build:latest]: https://hub.docker.com/r/oryxprod/build
[index.docker.io/microsoft/oryx-build]: https://hub.docker.com/r/microsoft/oryx-build

### Startup script generators

Expand Down Expand Up @@ -77,8 +75,7 @@ official images released for a given platform.

Each runtime image contains the startup script generator for its platform.

The *Run* images are published to MCR (mcr.microsoft.com/oryx/<platform>) and Docker Hub at
<https://hub.docker.com/u/oryxprod>.
The *Run* images are published to MCR (mcr.microsoft.com/oryx/&lt;platform&gt;).


## Repo structure
Expand Down
2 changes: 1 addition & 1 deletion doc/base_images.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Docker's basic [debian][library/debian:stable] image.
The build image copies some required platforms from separate intermediate images,
which can be built locally using the `build-buildimage-platforms.sh` script.

[build image]: https://hub.docker.com/r/microsoft/oryx-build
[build image]: https://hub.docker.com/_/microsoft-oryx-images
[library/buildpack-deps:stable]: https://hub.docker.com/_/buildpack-deps
[library/debian:stable]: https://hub.docker.com/_/debian

Expand Down
12 changes: 7 additions & 5 deletions doc/hosts/Dockerfile.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Just copy the generic [Dockerfile.oryx][] to your repo and register a
one-time or recurring task with the following commands.

[Azure Container Registry Tasks]: https://docs.microsoft.com/en-us/azure/container-registry/container-registry-tasks-overview
[Dockerfile.oryx]: ./Dockerfile.oryx
[Dockerfile.oryx]: https://github.com/microsoft/Oryx/blob/master/doc/hosts/Dockerfile.oryx

## Build once

Expand All @@ -22,10 +22,11 @@ Inject the Dockerfile and build your repo once.
registry_name=your-registry-name
image_name=your-image-name
repo_url='.' # or an accessible git repo URL
runtime=node-10.14 # choose from https://hub.docker.com/u/oryxprod
runtime=node:10.14 # choose tags from https://mcr.microsoft.com/v2/oryx/node/tags/list


cd path/to/your/repo
curl -sSLO https://raw.githubusercontent.com/Microsoft/Oryx/master/doc/acr/Dockerfile.oryx
curl -sSLO https://github.com/microsoft/Oryx/blob/master/doc/hosts/Dockerfile.oryx

az acr build \
--registry ${registry_name} \
Expand All @@ -43,10 +44,11 @@ Commit the Dockerfile to your repo and schedule fresh builds on new commits.
registry_name=your-registry-name
image_name=your-image-name
repo_url=https://github.com/myorg/myrepo.git # cannot be `.` for recurring task
runtime=node-10.14 # choose from https://hub.docker.com/u/oryxprod
runtime=node:10.14 # choose from https://mcr.microsoft.com/v2/oryx/node/tags/list


cd path/to/your/repo
curl -sSLO https://raw.githubusercontent.com/Microsoft/Oryx/master/doc/acr/Dockerfile.oryx
curl -sSLO https://github.com/microsoft/Oryx/blob/master/doc/hosts/Dockerfile.oryx

# commit and push the Oryx Dockerfile to your repo
git add Dockerfile.oryx && git commit -m "add generic Oryx Dockerfile" && git push
Expand Down
6 changes: 3 additions & 3 deletions doc/hosts/Dockerfile.oryx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# specify with `--build-arg "runtime-version"`
# available runtimes listed at https://hub.docker.com/u/oryxprod
ARG RUNTIME=node-10.14
ARG RUNTIME=node:10.14

FROM docker.io/oryxprod/build:latest as build
FROM mcr.microsoft.com/oryx/build:latest as build
WORKDIR /app
COPY . .
RUN oryx build /app

FROM docker.io/oryxprod/${RUNTIME}:latest
FROM mcr.microsoft.com/oryx/${RUNTIME}
COPY --from=build /app /app
RUN cd /app && oryx
ENTRYPOINT ["/app/run.sh"]

0 comments on commit 2c52ada

Please sign in to comment.