Skip to content

Commit

Permalink
Merge pull request #4331 from ipfs/fix/gecos
Browse files Browse the repository at this point in the history
Dockerfiles: do not set gecos field on user add. Set group.
  • Loading branch information
whyrusleeping authored Oct 22, 2017
2 parents 005d243 + b57539c commit 5d7fae6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN set -x \
&& chmod +x tini

# Get the TLS CA certificates, they're not provided by busybox.
RUN apt-get install -y ca-certificates
RUN apt-get update && apt-get install -y ca-certificates

# Now comes the actual target image, which aims to be as small as possible.
FROM busybox:1-glibc
Expand All @@ -62,8 +62,8 @@ EXPOSE 8081
# Create the fs-repo directory and switch to a non-privileged user.
ENV IPFS_PATH /data/ipfs
RUN mkdir -p $IPFS_PATH \
&& adduser -D -h $IPFS_PATH -u 1000 -g 100 ipfs \
&& chown 1000:100 $IPFS_PATH
&& adduser -D -h $IPFS_PATH -u 1000 -G users ipfs \
&& chown ipfs:users $IPFS_PATH

# Expose the fs-repo as a volume.
# start_ipfs initializes an fs-repo if none is mounted.
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.fast
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ EXPOSE 8081
# Create the fs-repo directory and switch to a non-privileged user.
ENV IPFS_PATH /data/ipfs
RUN mkdir -p $IPFS_PATH \
&& useradd -s /usr/sbin/nologin -d $IPFS_PATH -u 1000 -g 100 ipfs \
&& chown 1000:100 $IPFS_PATH
&& useradd -s /usr/sbin/nologin -d $IPFS_PATH -u 1000 -G users ipfs \
&& chown ipfs:users $IPFS_PATH

# Expose the fs-repo as a volume.
# start_ipfs initializes an fs-repo if none is mounted.
Expand Down

0 comments on commit 5d7fae6

Please sign in to comment.