feature/11-update_master_to_beta_release_commits #12

Merged
alexvanin merged 185 commits from r.loginov/distribution:feature/11-update_master_to_beta_release_commits into tcl/master 2024-08-19 12:13:20 +00:00
5 changed files with 7 additions and 7 deletions
Showing only changes of commit e1ec19ae60 - Show all commits

View file

@ -52,9 +52,9 @@ COPY --from=releaser /out /
FROM alpine:${ALPINE_VERSION} FROM alpine:${ALPINE_VERSION}
RUN apk add --no-cache ca-certificates 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 COPY --from=binary /registry /bin/registry
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]
EXPOSE 5000 EXPOSE 5000
ENTRYPOINT ["registry"] ENTRYPOINT ["registry"]
CMD ["serve", "/etc/docker/registry/config.yml"] CMD ["serve", "/etc/distribution/config.yml"]

View file

@ -50,7 +50,7 @@ specify it in the `docker run` command:
```bash ```bash
$ docker run -d -p 5000:5000 --restart=always --name registry \ $ 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 registry:2
``` ```

View file

@ -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 The easiest way to run a registry as a pull through cache is to run the official
Registry image. 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. as described in the following subsection.
Multiple registry caches can be deployed over the same back-end. A single Multiple registry caches can be deployed over the same back-end. A single

View file

@ -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 If you don't wan to use the default configuration file, you can supply
your own custom configuration file as follows: 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 ## Communication

View file

@ -43,7 +43,7 @@ services:
dockerfile: ./Dockerfile dockerfile: ./Dockerfile
command: command:
- "serve" - "serve"
- "/etc/docker/registry/config-test.yml" - "/etc/distribution/config-test.yml"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5001/debug/health"] test: ["CMD", "curl", "-f", "http://localhost:5001/debug/health"]
interval: 5s interval: 5s
@ -58,4 +58,4 @@ services:
- "5000:5000" - "5000:5000"
- "5001:5001" - "5001:5001"
volumes: volumes:
- ./conf-e2e-cloud-storage.yml:/etc/docker/registry/config-test.yml - ./conf-e2e-cloud-storage.yml:/etc/distribution/config-test.yml