Skip to content

fix(rootfs/Dockerfile,mc/Dockerfile): set DOCKERIMAGE environment variables #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arschles merged 2 commits into from
Jan 4, 2016
Merged

fix(rootfs/Dockerfile,mc/Dockerfile): set DOCKERIMAGE environment variables #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acd73ab
fix(Dockerfile): set env. variable in dockerfile
arschles Dec 17, 2015
19c79db
fix(Dockerfile): set DOCKERIMAGE=1 for the server
arschles Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,7 @@ ADD mc /bin/mc
ADD ./integration.sh /bin/integration.sh
RUN chmod +x /bin/integration.sh

# this is so the minio client (https://github.com/minio/mc) works properly
ENV DOCKERIMAGE=1

CMD mc
2 changes: 2 additions & 0 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM ubuntu-debootstrap:14.04
ENV MINIOHOME /home/minio
ENV MINIOUSER minio
RUN useradd -m -d $MINIOHOME $MINIOUSER
# this is so the minio client (https://github.com/minio/mc) works properly
ENV DOCKERIMAGE=1

RUN apt-get update -y && apt-get install -y -q \
ca-certificates \
Expand Down