Skip to content

Commit

Permalink
New path for distribution config (#4365)
Browse files Browse the repository at this point in the history
  • Loading branch information
milosgajdos committed Jun 11, 2024
2 parents 675d7e2 + 975613d commit e1ec19a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ COPY --from=releaser /out /

FROM alpine:${ALPINE_VERSION}
RUN apk add --no-cache ca-certificates
COPY cmd/registry/config-dev.yml /etc/docker/registry/config.yml
COPY cmd/registry/config-dev.yml /etc/distribution/config.yml
COPY --from=binary /registry /bin/registry
VOLUME ["/var/lib/registry"]
EXPOSE 5000
ENTRYPOINT ["registry"]
CMD ["serve", "/etc/docker/registry/config.yml"]
CMD ["serve", "/etc/distribution/config.yml"]
2 changes: 1 addition & 1 deletion docs/content/about/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ specify it in the `docker run` command:

```bash
$ docker run -d -p 5000:5000 --restart=always --name registry \
-v `pwd`/config.yml:/etc/docker/registry/config.yml \
-v `pwd`/config.yml:/etc/distribution/config.yml \
registry:2
```

Expand Down
2 changes: 1 addition & 1 deletion docs/content/recipes/mirror.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ be configured to use the `filesystem` driver for storage.

The easiest way to run a registry as a pull through cache is to run the official
Registry image.
At least, you need to specify `proxy.remoteurl` within `/etc/docker/registry/config.yml`
At least, you need to specify `proxy.remoteurl` within `/etc/distribution/config.yml`
as described in the following subsection.

Multiple registry caches can be deployed over the same back-end. A single
Expand Down
2 changes: 1 addition & 1 deletion docs/dockerhub.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ docker run -d -p 5000:5000 $PWD/FS/PATH:/var/lib/registry --restart always --nam
If you don't wan to use the default configuration file, you can supply
your own custom configuration file as follows:
```
docker run -d -p 5000:5000 $PWD/PATH/TO/config.yml:/etc/docker/registry/config.yml --restart always --name registry distribution/distribution:edge
docker run -d -p 5000:5000 $PWD/PATH/TO/config.yml:/etc/distribution/config.yml --restart always --name registry distribution/distribution:edge
```

## Communication
Expand Down
4 changes: 2 additions & 2 deletions tests/docker-compose-e2e-cloud-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ services:
dockerfile: ./Dockerfile
command:
- "serve"
- "/etc/docker/registry/config-test.yml"
- "/etc/distribution/config-test.yml"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5001/debug/health"]
interval: 5s
Expand All @@ -58,4 +58,4 @@ services:
- "5000:5000"
- "5001:5001"
volumes:
- ./conf-e2e-cloud-storage.yml:/etc/docker/registry/config-test.yml
- ./conf-e2e-cloud-storage.yml:/etc/distribution/config-test.yml

0 comments on commit e1ec19a

Please sign in to comment.