From acd73abebdd832b8d02730388370edbd2f95806c Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Wed, 16 Dec 2015 16:06:25 -0800 Subject: [PATCH 1/2] fix(Dockerfile): set env. variable in dockerfile This variable ensures that the mc client will work when compiled without cgo. See https://github.com/minio/mc/pull/1539 --- mc/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mc/Dockerfile b/mc/Dockerfile index a80d973..b057c49 100644 --- a/mc/Dockerfile +++ b/mc/Dockerfile @@ -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 From 19c79dbfecdbf81d6ebab9d456fdaa27136aad00 Mon Sep 17 00:00:00 2001 From: Aaron Schlesinger Date: Wed, 16 Dec 2015 16:08:45 -0800 Subject: [PATCH 2/2] fix(Dockerfile): set DOCKERIMAGE=1 for the server --- rootfs/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index f674e4e..97d52cd 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -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 \