Skip to content

Commit e9d1487

Browse files
author
Matthew Fisher
committed
fix(registry): fix upstream changes
Some things changed with the version bump like how the docker registry process is started and where dependencies are installed from.
1 parent 84362c9 commit e9d1487

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

registry/Dockerfile

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,27 @@ RUN useradd -s /bin/bash registry
1414

1515
# add the docker registry source from github
1616
RUN git clone https://github.com/deis/docker-registry /docker-registry
17+
RUN chown -R registry:registry /docker-registry
1718

1819
# lock the registry version to a tag
1920
RUN cd /docker-registry && git checkout repository-import
2021

2122
# install boto configuration
2223
RUN cp /docker-registry/config/boto.cfg /etc/boto.cfg
23-
RUN cd /docker-registry && pip install -r requirements.txt
24+
RUN cd /docker-registry && pip install -r requirements/main.txt
25+
26+
# Install core
27+
RUN pip install /docker-registry/depends/docker-registry-core
28+
29+
# Install registry
30+
RUN pip install file:///docker-registry#egg=docker-registry[bugsnag]
31+
32+
ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
33+
ENV SETTINGS_FLAVOR dev
2434

2535
# create data volume
2636
RUN mkdir -p /data/repositories && chown -R registry:registry /data
37+
ENV STORAGE_PATH /data
2738
VOLUME /data
2839

2940
# add the current build context to /app

registry/bin/boot

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ test -d /data && chown registry:registry /data
4646

4747
# spawn the service in the background
4848
cd /docker-registry
49-
./setup-configs.sh
50-
sudo -E -u registry ./run.sh &
49+
sudo -E -u registry docker-registry &
5150
SERVICE_PID=$!
5251

5352
# smart shutdown on SIGINT and SIGTERM

0 commit comments

Comments
 (0)