Merge pull request #847 from aaronlehmann/harmonize-config-paths

In the build container, change the config file location to /etc/docker/registry/config.yml
This commit is contained in:
Olivier Gambier 2015-08-11 16:54:44 -07:00
commit 94296c1623

View file

@ -10,10 +10,10 @@ ENV DOCKER_BUILDTAGS include_rados
WORKDIR $DISTRIBUTION_DIR WORKDIR $DISTRIBUTION_DIR
COPY . $DISTRIBUTION_DIR COPY . $DISTRIBUTION_DIR
COPY cmd/registry/config-dev.yml $DISTRIBUTION_DIR/cmd/registry/config.yml COPY cmd/registry/config-dev.yml /etc/docker/registry/config.yml
RUN make PREFIX=/go clean binaries RUN make PREFIX=/go clean binaries
VOLUME ["/var/lib/registry"] VOLUME ["/var/lib/registry"]
EXPOSE 5000 EXPOSE 5000
ENTRYPOINT ["registry"] ENTRYPOINT ["registry"]
CMD ["cmd/registry/config.yml"] CMD ["/etc/docker/registry/config.yml"]