Skip to content

Commit cd9c847

Browse files
committed
chore(registry): use DRYCC_UID DRYCC_GID env
1 parent 4392975 commit cd9c847

1 file changed

Lines changed: 11 additions & 12 deletions

File tree

Dockerfile

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,20 @@ RUN export GO111MODULE=on \
99

1010
FROM docker.io/drycc/base:bullseye
1111

12-
ARG DRYCC_UID=1001
13-
ARG DRYCC_GID=1001
14-
ARG DRYCC_HOME_DIR=/var/lib/registry
15-
16-
RUN groupadd drycc --gid ${DRYCC_GID} \
17-
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR}
12+
ENV DRYCC_UID=1001 \
13+
DRYCC_GID=1001 \
14+
DRYCC_HOME_DIR=/var/lib/registry \
15+
JQ_VERSION="1.6" \
16+
MC_VERSION="2022.02.26.03.58.31" \
17+
REGISTRY_VERSION="2.8.0"
1818

1919
COPY rootfs/bin/ /bin/
2020
COPY rootfs/config-example.yml /etc/docker/registry/config.yml
2121
COPY --from=build /usr/local/bin/registry /opt/registry/bin/registry
22-
ENV JQ_VERSION="1.6" \
23-
MC_VERSION="2022.02.26.03.58.31" \
24-
REGISTRY_VERSION="2.8.0"
2522

26-
RUN install-stack jq $JQ_VERSION \
23+
RUN groupadd drycc --gid ${DRYCC_GID} \
24+
&& useradd drycc -u ${DRYCC_UID} -g ${DRYCC_GID} -s /bin/bash -m -d ${DRYCC_HOME_DIR} \
25+
&& install-stack jq $JQ_VERSION \
2726
&& install-stack mc $MC_VERSION \
2827
&& install-stack registry $REGISTRY_VERSION \
2928
&& chmod +x /bin/create_bucket /bin/normalize_storage \
@@ -41,9 +40,9 @@ RUN install-stack jq $JQ_VERSION \
4140
/usr/lib/`echo $(uname -m)`-linux-gnu/gconv/IBM* \
4241
/usr/lib/`echo $(uname -m)`-linux-gnu/gconv/EBC* \
4342
&& mkdir -p /usr/share/man/man{1..8} \
44-
&& chown -R drycc:drycc ${DRYCC_HOME_DIR}
43+
&& chown -R ${DRYCC_GID}:${DRYCC_UID} ${DRYCC_HOME_DIR}
4544

46-
USER drycc
45+
USER ${DRYCC_UID}
4746
VOLUME ["${DRYCC_HOME_DIR}"]
4847
CMD ["/opt/registry/bin/registry"]
4948
EXPOSE 5000

0 commit comments

Comments
 (0)